diff --git a/.travis.yml b/.travis.yml index a7bea0f91..6e159cc21 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,8 +46,7 @@ script: sudo apt-get install -y qemu-user-static && sh ci/run-docker.sh $TARGET; else - cargo test --target $TARGET && - cargo test --target $TARGET --release; + sh ci/run.sh $TARGET; fi # Travis can't cache files that are not readable by "others" - chmod -R a+r $HOME/.cargo diff --git a/ci/run.sh b/ci/run.sh index 455bb2e40..7dc9be178 100755 --- a/ci/run.sh +++ b/ci/run.sh @@ -55,7 +55,13 @@ case $TRAVIS_OS_NAME in esac # NOTE On i586, It's normal that the get_pc_thunk symbol appears several times so ignore it -stdout=$($PREFIX$NM -g --defined-only /target/${1}/debug/librustc_builtins.rlib) +if [ $TRAVIS_OS_NAME = osx ]; then + path=target/${1}/debug/librustc_builtins.rlib +else + path=/target/${1}/debug/librustc_builtins.rlib +fi + +stdout=$($PREFIX$NM -g --defined-only $path) set +e echo "$stdout" | sort | uniq -d | grep -v __x86.get_pc_thunk | grep 'T __'