From 560018cc839a38864fe628d20850dd2eb5e4ddca Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Fri, 23 Jun 2017 10:44:29 -0700 Subject: [PATCH] Less verbose output on symbol check --- ci/run.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ci/run.sh b/ci/run.sh index 6977455..e5c8924 100755 --- a/ci/run.sh +++ b/ci/run.sh @@ -77,7 +77,7 @@ case $1 in ;; esac -case $TRAVIS_OS_NAME in +case "$TRAVIS_OS_NAME" in osx) # NOTE OSx's nm doesn't accept the `--defined-only` or provide an equivalent. # Use GNU nm instead @@ -89,14 +89,15 @@ case $TRAVIS_OS_NAME in ;; esac -if [ $TRAVIS_OS_NAME = osx ]; then +if [ "$TRAVIS_OS_NAME" = osx ]; then path=target/${1}/debug/deps/libcompiler_builtins-*.rlib else path=/target/${1}/debug/deps/libcompiler_builtins-*.rlib fi for rlib in $(echo $path); do - stdout=$($PREFIX$NM -g --defined-only $rlib) + set +x + stdout=$($PREFIX$NM -g --defined-only $rlib 2>&1) # NOTE On i586, It's normal that the get_pc_thunk symbol appears several times so ignore it set +e @@ -105,6 +106,7 @@ for rlib in $(echo $path); do if test $? = 0; then exit 1 fi + set -ex done true