Auto merge of #58224 - pietroalbini:revert-appveyor-debug, r=alexcrichton

Revert appveyor debug code

r? @alexcrichton
This commit is contained in:
bors 2019-02-06 22:48:39 +00:00
commit ff9158c1f8
2 changed files with 1 additions and 17 deletions

View File

@ -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

View File

@ -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"