diff options
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rwxr-xr-x | test_layers | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index e6e42ecf..3093955c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,7 +30,9 @@ matrix: - env: COMMAND=./test_layers CXX=clang++ START=edit3 - env: COMMAND=./test_layers CXX=clang++ START=edit4 - env: COMMAND=./test_layers CXX=g++ START=one-off # minimal testing for gcc - - env: COMMAND=./subx/test_layers START= END= + - env: COMMAND=./subx/test_layers + - env: COMMAND=./test_layers BUILD=build0 START=one-off + - env: COMMAND=./test_layers BUILD=build1 START=one-off script: - $COMMAND $START $END diff --git a/test_layers b/test_layers index 73c00597..d23776da 100755 --- a/test_layers +++ b/test_layers @@ -15,9 +15,11 @@ # test_layers app set -e +test "$BUILD" || export BUILD=build1 + if [[ $1 == one-off ]] then - ./build1 + ./$BUILD ./mu_bin test || exit 1 exit 0 fi @@ -29,7 +31,7 @@ do if [[ $2 && $f > $2 ]]; then exit 0; fi echo "=== $f" rm -rf .build mu.cc mu_bin core.mu # force full rebuild for top-level, but not subsidiary tools like tangle and cleave - ./build1 --until $f || exit 1 + ./$BUILD --until $f || exit 1 # valgrind requires Linux valgrind --leak-check=yes --num-callers=40 -q --error-exitcode=1 ./mu_bin test || exit 1 # run on Mac OS without valgrind, and with a hacky fix for the coarser clock @@ -39,7 +41,7 @@ done # Layers for Mu apps without Valgrind ./clean -./build1 +./$BUILD if [[ ! $1 || $1 == chessboard ]] then |