2946

Reorganize build system to minimize duplication while handling 3
scenarios:

1. Locally running tests with `mu test`
2. Locally running tests until some layer with `build_and_test_until`
3. Running on Linux with `test_layers`
4. Running on Travis CI with multiple sharded calls to `test_layers`

One thing we drop at this point is support for OSX in test_layers. We
don't need it now that we have Travis CI working.

1 files changed, 2 insertions, 22 deletions

diff --git a/build_and_test_until b/build_and_test_until
index 80a6357f..809cb73c 100755
--- a/build_and_test_until
+++ b/build_and_test_until
@@ -1,24 +1,4 @@
 #!/bin/bash
-# Load all files sorting before the given argument.
-# You can pass in a prefix, but files matching the prefix *won't* be included.
 
-set -e
-set -v
-make --no-print-directory tangle/tangle
-make --no-print-directory enumerate/enumerate
-./tangle/tangle $(./enumerate/enumerate --until $1 |grep -v '.mu$') |grep -v "^\s*//:" > mu.cc
-cat /dev/null $(./enumerate/enumerate --until $1 |grep '.mu$') > core.mu
-make --no-print-directory autogenerated_lists
-set +v
-if [[ `uname` == "Darwin" ]]
-then
-  # Darwin is shit and otherwise thinks mu_bin is newer than the files it just
-  # generated when called from test_all_layers.
-  # All sorts of strange bugs ensue.
-  sleep 1
-  set -v  # Darwin's clang and valgrind is shit.
-  CFLAGS=${CFLAGS:-"-g -O3"} make test
-else
-  set -v
-  CXX=${CXX:-clang++} CFLAGS=${CFLAGS:-"-g -O3 -fsanitize=undefined -Wno-tautological-constant-out-of-range-compare"} make ${2:-valgrind}
-fi
+./build_until $1
+./mu_bin test