From b16be6f929dd4118790cd9e54025fe298cea6eac Mon Sep 17 00:00:00 2001 From: Michael Ernst Date: Mon, 8 Jun 2020 10:42:56 -0700 Subject: [PATCH] Suppress output of cd command, in case CDPATH environment variable is set; fixes #3359 --- .travis-build.sh | 4 ++-- checker/bin-devel/test-cf-inference.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis-build.sh b/.travis-build.sh index 2cc1e3a1d03..3ebac35f96f 100755 --- a/.travis-build.sh +++ b/.travis-build.sh @@ -1,6 +1,6 @@ #!/bin/bash -echo "Entering $(cd "$(dirname "$0")" && pwd -P)/$(basename "$0") in $(pwd)" +echo "Entering $(cd "$(dirname "$0")" >/dev/null 2>&1 && pwd -P)/$(basename "$0") in $(pwd)" # Fail the whole script if any command fails @@ -71,4 +71,4 @@ case $GROUP in esac -echo Exiting "$(cd "$(dirname "$0")" && pwd -P)/$(basename "$0") in $(pwd)" +echo Exiting "$(cd "$(dirname "$0")" >/dev/null 2>&1 && pwd -P)/$(basename "$0") in $(pwd)" diff --git a/checker/bin-devel/test-cf-inference.sh b/checker/bin-devel/test-cf-inference.sh index 3460600fb2c..3699fb1adfb 100755 --- a/checker/bin-devel/test-cf-inference.sh +++ b/checker/bin-devel/test-cf-inference.sh @@ -16,8 +16,8 @@ source "$SCRIPTDIR"/build.sh ## script rather than in ./test/downstream.sh because it is most likely to fail, ## and it's helpful to see that only it, not other downstream tests, failed. -/tmp/$USER/plume-scripts/git-clone-related typetools checker-framework-inference +"/tmp/$USER/plume-scripts/git-clone-related" typetools checker-framework-inference -export AFU="${AFU:-$(cd ../annotation-tools/annotation-file-utilities && pwd -P)}" +export AFU="${AFU:-$(cd ../annotation-tools/annotation-file-utilities >/dev/null 2>&1 && pwd -P)}" export PATH=$AFU/scripts:$PATH (cd ../checker-framework-inference && ./.travis-build.sh)