Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert appveyor debug code #58224

Merged
merged 2 commits into from
Feb 7, 2019
Merged

Revert appveyor debug code #58224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f20348
Revert "Rollup merge of #58162 - pietroalbini:track-259, r=alexcrichton"
pietroalbini Feb 6, 2019
9959924
Revert "Auto merge of #57975 - alexcrichton:debug-exit-appveyor, r=pi…
pietroalbini Feb 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions appveyor.yml
View file
Open in desktop
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
View file
Open in desktop
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