Skip to content

Commit

Permalink
Cleanup build process (capstone-engine#1140)
Browse files Browse the repository at this point in the history
* 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 nteract/nteract#1523 (comment)
  • Loading branch information
stephengroat authored and aquynh committed May 25, 2018
1 parent 5e184ec commit 9361378
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
8 changes: 3 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 9361378

Please sign in to comment.