From 9361378e8543d312ed22285114a9ad5598f41b2b Mon Sep 17 00:00:00 2001 From: Stephen Date: Fri, 25 May 2018 08:59:30 -0400 Subject: [PATCH] Cleanup build process (#1140) * Cleanup build process avoiding bash subshells (which happen in for loops) because they like to selectively inherit environment variables * address restrictions of osx sip see https://github.com/nteract/nteract/issues/1523#issuecomment-284027093 --- .travis.yml | 2 +- Makefile | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4e323fa46a..69bceaa0be 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,9 +3,9 @@ sudo: false env: global: - LD_LIBRARY_PATH=$TRAVIS_BUILD_DIR/tests/:$TRAVIS_BUILD_DIR:$LD_LIBRARY_PATH - - DYLD_LIBRARY_PATH=$TRAVIS_BUILD_DIR/tests/:$TRAVIS_BUILD_DIR:$DYLD_LIBRARY_PATH script: - ./make.sh + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ./make.sh install; fi - make check - cd bindings/python && make check compiler: diff --git a/Makefile b/Makefile index 933e46e59f..837148cad3 100644 --- a/Makefile +++ b/Makefile @@ -443,11 +443,9 @@ TESTS += test_basic.static test_detail.static test_arm.static test_arm64.static TESTS += test_mips.static test_ppc.static test_sparc.static TESTS += test_systemz.static test_x86.static test_xcore.static TESTS += test_skipdata test_skipdata.static test_iter.static -check: - @for t in $(TESTS); do \ - echo Check $$t ... ; \ - LD_LIBRARY_PATH=./tests ./tests/$$t > /dev/null && echo OK || echo FAILED; \ - done +check: $(TESTS) +test_%: + ./tests/$@ > /dev/null && echo OK || echo FAILED $(OBJDIR)/%.o: %.c @mkdir -p $(@D)