Skip to content

Commit

Permalink
CI: running test builds in single docker runs
Browse files Browse the repository at this point in the history
fuchsto committed Nov 8, 2016
1 parent edc4168 commit 5a17f26
Showing 3 changed files with 15 additions and 25 deletions.
6 changes: 5 additions & 1 deletion circle.yml
Original file line number Diff line number Diff line change
@@ -10,7 +10,11 @@ test:
override:
- bash ./dash/scripts/circleci/pull-docker.sh:
parallel: true
- bash ./dash/scripts/circleci/run-docker.sh:
- bash ./dash/scripts/circleci/run-docker.sh Release:
parallel: true
- bash ./dash/scripts/circleci/run-docker.sh Minimal:
parallel: true
- bash ./dash/scripts/circleci/run-docker.sh Nasty:
parallel: true
- cat ./dash-ci.log | grep "PASSED" || (echo "Full log:" ; cat ./dash-ci.log ; exit 1):
parallel: true
15 changes: 9 additions & 6 deletions dash/scripts/circleci/run-docker.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#!/bin/bash

MPIENVS=(openmpi mpich)
BUILD_CONFIG=$1

# run tests
i=0
@@ -9,13 +10,15 @@ for MPIENV in ${MPIENVS[@]}; do

echo "Starting docker container: $MPIENV"

docker run -v $PWD:/opt/dash dashproject/ci:$MPIENV /bin/sh -c "export DASH_MAKE_PROCS='4'; export DASH_MAX_UNITS='3'; export DASH_BUILDEX='OFF'; sh dash/scripts/dash-ci.sh | grep -v 'LOG =' | tee dash-ci.log 2> dash-ci.err;"
docker run -v $PWD:/opt/dash dashproject/ci:$MPIENV /bin/sh -c "export DASH_MAKE_PROCS='4'; export DASH_MAX_UNITS='3'; export DASH_BUILDEX='OFF'; sh dash/scripts/dash-ci.sh $BUILD_CONFIG | grep -v 'LOG =' | tee dash-ci.log 2> dash-ci.err;"

TARGETS=`ls -d ./build-ci/*/* | xargs -n1 basename`
for TARGET in $TARGETS; do
mkdir -p $CIRCLE_TEST_REPORTS/$MPIENV/$TARGET
cp ./build-ci/*/$TARGET/dash-tests-*.xml $CIRCLE_TEST_REPORTS/$MPIENV/$TARGET/
done
# TARGETS=`ls -d ./build-ci/*/* | xargs -n1 basename`
# for TARGET in $TARGETS; do
# mkdir -p $CIRCLE_TEST_REPORTS/$MPIENV/$TARGET
# cp ./build-ci/*/$TARGET/dash-tests-*.xml $CIRCLE_TEST_REPORTS/$MPIENV/$TARGET/
# done
mkdir -p $CIRCLE_TEST_REPORTS/$MPIENV/$BUILD_CONFIG
cp ./build-ci/*/$BUILD_CONFIG/dash-tests-*.xml $CIRCLE_TEST_REPORTS/$MPIENV/$BUILD_CONFIG/

echo "checking logs"

19 changes: 1 addition & 18 deletions dash/test/MatrixTest.cc
Original file line number Diff line number Diff line change
@@ -717,23 +717,6 @@ TEST_F(MatrixTest, StorageOrder)
}

dash::barrier();

if (dash::myid() == 0) {
std::cout << "row major:" << std::endl;
for (int row = 0; row < static_cast<int>(nrows); ++row) {
for (int col = 0; col < static_cast<int>(ncols); ++col) {
std::cout << std::setw(5) << (int)(mat_row[row][col]) << " ";
}
std::cout << std::endl;
}
std::cout << "column major:" << std::endl;
for (int row = 0; row < static_cast<int>(nrows); ++row) {
for (int col = 0; col < static_cast<int>(ncols); ++col) {
std::cout << std::setw(5) << (int)(mat_col[row][col]) << " ";
}
std::cout << std::endl;
}
}
}

TEST_F(MatrixTest, DelayedAlloc)
@@ -1036,7 +1019,7 @@ TEST_F(MatrixTest, DelayedPatternAllocation)
long block_size_x = dash::size();
long block_size_y = dash::size();
dash::NArray<int, 2, long, pattern_t > matrix;

{
auto & team = dash::Team::All();
dash::TeamSpec<2> ts(team);

0 comments on commit 5a17f26

Please sign in to comment.