Skip to content

Commit ff9158c

Browse files
committed
Auto merge of #58224 - pietroalbini:revert-appveyor-debug, r=alexcrichton
Revert appveyor debug code r? @alexcrichton
2 parents b139669 + 9959924 commit ff9158c

File tree

2 files changed

+1
-17
lines changed

2 files changed

+1
-17
lines changed

appveyor.yml

+1-4
Original file line numberDiff line numberDiff line change
@@ -207,10 +207,7 @@ test_script:
207207
- sh src/ci/init_repo.sh . /c/cache/rustsrc
208208
- set SRC=.
209209
- set NO_CCACHE=1
210-
# Added this debugging code to try tracking down https://github.com/rust-lang/rust/issues/58160
211-
# Replace it with the commented line below after the issue with AppVeyor is fixed
212-
- "sh src/ci/run.sh & set ret=%errorlevel% & echo exit code in appveyor.yml: %ret% & exit %ret%"
213-
# - sh src/ci/run.sh
210+
- sh src/ci/run.sh
214211

215212
on_failure:
216213
# Dump crash log

src/ci/run.sh

-13
Original file line numberDiff line numberDiff line change
@@ -121,20 +121,7 @@ fi
121121
travis_fold end log-system-info
122122

123123
if [ ! -z "$SCRIPT" ]; then
124-
# This `set +e` followed by capturing the return value is a temporary measure
125-
# to help debug "error with exit 259" on AppVeyor temporarily, otherwise all
126-
# that's needed here is the `sh`
127-
set +e
128124
sh -x -c "$SCRIPT"
129-
ret=$?
130-
echo "exit code in src/ci/run.sh: $ret"
131-
132-
echo "tasklist:"
133-
tasklist
134-
echo -n "location of sh: "
135-
where sh
136-
137-
exit $ret
138125
else
139126
do_make() {
140127
travis_fold start "make-$1"

0 commit comments

Comments
 (0)