diff --git a/appveyor.yml b/appveyor.yml index 0ec4210af98b2..d70ad54b1c812 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -207,10 +207,7 @@ test_script: - sh src/ci/init_repo.sh . /c/cache/rustsrc - set SRC=. - set NO_CCACHE=1 - # Added this debugging code to try tracking down https://github.com/rust-lang/rust/issues/58160 - # Replace it with the commented line below after the issue with AppVeyor is fixed - - "sh src/ci/run.sh & set ret=%errorlevel% & echo exit code in appveyor.yml: %ret% & exit %ret%" -# - sh src/ci/run.sh + - sh src/ci/run.sh on_failure: # Dump crash log diff --git a/src/ci/run.sh b/src/ci/run.sh index 0841e70a6ed29..42d0d7db5964c 100755 --- a/src/ci/run.sh +++ b/src/ci/run.sh @@ -121,20 +121,7 @@ fi travis_fold end log-system-info if [ ! -z "$SCRIPT" ]; then - # This `set +e` followed by capturing the return value is a temporary measure - # to help debug "error with exit 259" on AppVeyor temporarily, otherwise all - # that's needed here is the `sh` - set +e sh -x -c "$SCRIPT" - ret=$? - echo "exit code in src/ci/run.sh: $ret" - - echo "tasklist:" - tasklist - echo -n "location of sh: " - where sh - - exit $ret else do_make() { travis_fold start "make-$1"