Skip to content

Commit

Permalink
Auto merge of #58224 - pietroalbini:revert-appveyor-debug, r=alexcric…
Browse files Browse the repository at this point in the history
…hton

Revert appveyor debug code

r? @alexcrichton
  • Loading branch information
bors committed Feb 6, 2019
2 parents b139669 + 9959924 commit ff9158c
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 17 deletions.
5 changes: 1 addition & 4 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
13 changes: 0 additions & 13 deletions src/ci/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit ff9158c

Please sign in to comment.