diff options
| author | Ben Smith <binji@chromium.org> | 2016-04-01 11:24:19 -0700 |
|---|---|---|
| committer | Ben Smith <binji@chromium.org> | 2016-04-01 12:45:23 -0700 |
| commit | 0592bad3415282a3f7636102507958b25ad65e49 (patch) | |
| tree | 1908597d096119db60ab57c34f1a78f028ff1bd3 /scripts | |
| parent | 2ed6348f8c56c027f6726a3aceda4442aa6cd774 (diff) | |
| download | wabt-0592bad3415282a3f7636102507958b25ad65e49.tar.gz wabt-0592bad3415282a3f7636102507958b25ad65e49.tar.bz2 wabt-0592bad3415282a3f7636102507958b25ad65e49.zip | |
clean up Makefile and CMakeLists.txt
Primarily this is moving the sanitizer builds out of CMakeLists.txt and
into the Makefile. It's much cleaner this way.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/travis-build.sh | 2 | ||||
| -rw-r--r-- | scripts/travis-common.sh | 2 | ||||
| -rwxr-xr-x | scripts/travis-test.sh | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/scripts/travis-build.sh b/scripts/travis-build.sh index 03ba5ae3..56fdac5a 100755 --- a/scripts/travis-build.sh +++ b/scripts/travis-build.sh @@ -34,7 +34,7 @@ for COMPILER in ${COMPILERS}; do make ${COMPILER}-${BUILD_TYPE} if [ ${COMPILER} = "clang" ]; then for SANITIZER in ${SANITIZERS}; do - make ${CC}-${BUILD_TYPE}${SANITIZER} + make ${CC}-${BUILD_TYPE}-${SANITIZER} done fi done diff --git a/scripts/travis-common.sh b/scripts/travis-common.sh index c5db436e..25e26a06 100644 --- a/scripts/travis-common.sh +++ b/scripts/travis-common.sh @@ -19,7 +19,7 @@ SCRIPT_DIR="$(dirname "$(readlink -f "$0")")" ROOT_DIR="$(dirname "${SCRIPT_DIR}")" BUILD_TYPES="debug release" BUILD_TYPES_UPPER="Debug Release" -SANITIZERS="-asan -lsan -msan" +SANITIZERS="asan lsan msan" if [ ${CC} = "gcc" ]; then COMPILERS="gcc gcc-i686" diff --git a/scripts/travis-test.sh b/scripts/travis-test.sh index 051f4e5a..b83d8e55 100755 --- a/scripts/travis-test.sh +++ b/scripts/travis-test.sh @@ -33,14 +33,14 @@ run_tests() { set_run_test_args() { local COMPILER=$1 local BUILD_TYPE=$2 - local SANITIZER=${3:-} - SEXPR_WASM=out/${COMPILER}/${BUILD_TYPE}/sexpr-wasm${SANITIZER} - WASM_WAST=out/${COMPILER}/${BUILD_TYPE}/wasm-wast${SANITIZER} + local CONFIG=${3:-} + SEXPR_WASM=out/${COMPILER}/${BUILD_TYPE}/${CONFIG}/sexpr-wasm + WASM_WAST=out/${COMPILER}/${BUILD_TYPE}/${CONFIG}/wasm-wast RUN_TEST_ARGS="--sexpr-wasm ${SEXPR_WASM} --wasm-wast ${WASM_WAST}" } if [ ${CC} = "gcc" ]; then - set_run_test_args gcc Debug-no-flex-bison + set_run_test_args gcc Debug no-flex-bison run_tests fi |