summaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorMatthias Beyer <mail@beyermatthias.de>2016-09-20 10:20:59 +0200
committerGitHub <noreply@github.com>2016-09-20 10:20:59 +0200
commit050aec2aa166e8bc47630ce2543505ebefc21ea9 (patch)
tree09be5cb5ab7d788518bf02007f39444d5f2ad2cf /.travis.yml
parente1177717ee84ce4e21628dbd156a2977597dc89f (diff)
parente24619a08f192543a02e6003ef144e5443e8a156 (diff)
Merge pull request #734 from matthiasbeyer/test-via-makefile
Execute tests via Makefile
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml13
1 files changed, 2 insertions, 11 deletions
diff --git a/.travis.yml b/.travis.yml
index 633b0edb..365c9971 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,18 +21,9 @@ before_script:
script:
- |
if [[ "$TEST_SUITE" == "binaries" ]]; then
- make $(find . -maxdepth 1 -name "imag-*" -type d -printf "%f ") && \
- for d in $(find -name "Cargo.toml" | grep -vE "^./Cargo.toml$"); do
- dir=$(dirname $d)
- echo "--- Running test scripts ---"
- for testsh in $(find $dir -iname "*test.sh"); do
- echo "--- Running test script: '$testsh'"
- bash $testsh || { echo "--- Test failed. Exiting"; exit 1; }
- echo "--- Test script $testsh executed successfully"
- done
- done
+ make bin-test
else # $TEST_SUITE == "libraries"
- make $(find . -maxdepth 1 -name "libimag*" -printf "test-%f ")
+ make lib-test
fi
addons: