diff --git a/.travis.yml b/.travis.yml index 5722fe1b..d8b05f08 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,12 +27,6 @@ before_script: script: - | - changes_in() { - [[ $(git diff --name-only $(git merge-base master $TRAVIS_COMMIT)..$TRAVIS_COMMIT | \ - cut -d "/" -f 1 | \ - grep "$n") ]] > /dev/null - } - travis_cargo_run_in() { echo ":: Trying to run cargo in $1" [[ -d "$1" ]] && @@ -47,26 +41,25 @@ script: } run_sh_test() { - echo "-- Running test script: $1" - bash $1 || { echo "-- Test failed. Exiting"; exit 1; } - echo "-- Test script $1 executed successfully" + echo "--- Running test script: $1" + bash $1 || { echo "--- Test failed. Exiting"; exit 1; } + echo "--- Test script $1 executed successfully" } - [[ $(changes_in "doc") ]] && echo "Changes in ./doc are not build by CI" + echo "<< Changes in ./doc are not build by CI >>" for d in $(find -name "Cargo.toml" | grep -vE "^./Cargo.toml$"); do echo ":: Working on $d" dir=$(dirname $d) { \ - changes_in $dir && \ - echo -e "\nRunning in $d\n" && \ - travis_cargo_run_in $dir && \ - tree -I "*doc*" $dir && \ - echo "-- Running test scripts..." && \ + echo -e "\n--- Running in $d ---\n" && \ + travis_cargo_run_in $dir && \ + tree -I "*doc*" $dir && \ + echo "--- Running test scripts ---" && \ for testsh in $(find $dir -iname "*test.sh"); do run_sh_test $testsh done && \ - echo "-- Done with test scripts..." + echo -e "--- Done with test scripts ---\n\n" } || true done