2945

More tweaking; edit/ still taking too long to test on Travis CI.

2 files changed, 54 insertions, 10 deletions

diff --git a/.travis.yml b/.travis.yml
index e44f1f31..e117f4fd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,15 +16,20 @@ before_install:
 # matrix so we don't time out on Travis
 matrix:
   include:
-    - env: CXX=clang++ START=000 END=020
-    - env: CXX=clang++ START=020 END=040
-    - env: CXX=clang++ START=040 END=060
-    - env: CXX=clang++ START=060 END=070
-    - env: CXX=clang++ START=070 END=080
+    - env: CXX=clang++ START=000 END=040
+    - env: CXX=clang++ START=040 END=055
+    - env: CXX=clang++ START=055 END=060
+    - env: CXX=clang++ START=060 END=060
+    - env: CXX=clang++ START=065 END=070
+    - env: CXX=clang++ START=070 END=075
+    - env: CXX=clang++ START=075 END=080
     - env: CXX=clang++ START=080 END=090
     - env: CXX=clang++ START=090 END=999
     - env: CXX=clang++ START=chessboard
     - env: CXX=clang++ START=edit
+    - env: CXX=clang++ START=edit2
+    - env: CXX=clang++ START=edit3
+    - env: CXX=clang++ START=edit4
 
 script:
   - ./test_layers $START $END
diff --git a/test_layers b/test_layers
index 88382a6e..a8804c41 100755
--- a/test_layers
+++ b/test_layers
@@ -3,23 +3,26 @@
 #
 # Test all layers:
 #   test_layers
-# Test layers after x:
+# Test non-app layers after x:
 #   test_layers x
 # Test layers after x and until y (inclusive):
 #   test_layers x y
 # Test all layers for a specific app:
 #   test_layers app
 
+TEST_UNTIL="./build_and_test_until"
+MAKE="make"
+VALGRIND="valgrind --leak-check=yes --num-callers=40 -q --error-exitcode=1"
+
 for f in [0-9]*
 do
   if [[ $f < $1 ]]; then continue; fi
   if [[ $2 && $f > $2 ]]; then exit 0; fi
   echo "=== $f"
-  ./build_and_test_until $f || exit 1
+  $TEST_UNTIL $f || exit 1
 done
 
-CXX=clang++ CFLAGS="-g -O3 -fsanitize=undefined -Wno-tautological-constant-out-of-range-compare" make
-VALGRIND="valgrind --leak-check=yes --num-callers=40 -q --error-exitcode=1"
+CXX=clang++ CFLAGS="-O3 -fsanitize=undefined -Wno-tautological-constant-out-of-range-compare" $MAKE
 
 if [[ ! $1 || $1 == chessboard ]]
 then
@@ -27,7 +30,7 @@ then
   $VALGRIND ./mu_bin test chessboard.mu || exit 1
 fi
 
-if [[ ! $1 || $1 == edit ]]
+if [[ ! $1 ]]
 then
   for f in edit/[0-9]*
   do
@@ -35,3 +38,39 @@ then
     $VALGRIND ./mu_bin test `echo edit/[0-9]* |perl -pwe "s,$f.*,$f,"` || exit 1
   done
 fi
+
+if [[ $1 && $1 == edit ]]
+then
+  for f in edit/00[1-3]*
+  do
+    echo "=== edit: until $f"
+    $VALGRIND ./mu_bin test `echo edit/[0-9]* |perl -pwe "s,$f.*,$f,"` || exit 1
+  done
+fi
+
+if [[ $1 && $1 == edit2 ]]
+then
+  for f in edit/00[4-6]*
+  do
+    echo "=== edit: until $f"
+    $VALGRIND ./mu_bin test `echo edit/[0-9]* |perl -pwe "s,$f.*,$f,"` || exit 1
+  done
+fi
+
+if [[ $1 && $1 == edit3 ]]
+then
+  for f in edit/00[7-9]*
+  do
+    echo "=== edit: until $f"
+    $VALGRIND ./mu_bin test `echo edit/[0-9]* |perl -pwe "s,$f.*,$f,"` || exit 1
+  done
+fi
+
+if [[ $1 && $1 == edit4 ]]
+then
+  for f in edit/01*
+  do
+    echo "=== edit: until $f"
+    $VALGRIND ./mu_bin test `echo edit/[0-9]* |perl -pwe "s,$f.*,$f,"` || exit 1
+  done
+fi