debug

Author: JohnTitor

ci/install-rust.sh

@@ -19,6 +19,9 @@ else
   rustup set profile minimal
   rustup update --force $toolchain
   rustup default $toolchain
+  cargo install rustup-toolchain-install-master
+  rustup-toolchain-install-master f1b97ee7f8ffb1a814944b85c7e05a1555a7eda5
+  rustup default f1b97ee7f8ffb1a814944b85c7e05a1555a7eda5
 fi
 
 if [ -n "$TARGET" ]; then

ci/run.sh

@@ -82,45 +82,5 @@ if [ "$QEMU" != "" ]; then
   exec egrep "^(PASSED)|(test result: ok)" "${CARGO_TARGET_DIR}/out.log"
 fi
 
-# FIXME: x86_64-unknown-linux-gnux32 fails to compile without --release
-# See https://github.com/rust-lang/rust/issues/59220
-opt=
-if [ "$TARGET" = "x86_64-unknown-linux-gnux32" ]; then
-  opt="--release"
-fi
-
-if [ "$TARGET" = "s390x-unknown-linux-gnu" ]; then
-  # FIXME: s390x-unknown-linux-gnu often fails to test due to timeout,
-  # so we retry this N times.
-  N=5
-  n=0
-  passed=0
-  until [ $n -ge $N ]
-  do
-    if [ "$passed" = "0" ]; then
-      if cargo test --no-default-features --manifest-path libc-test/Cargo.toml --target "${TARGET}" ; then
-        passed=$((passed+1))
-        continue
-      fi
-    elif [ "$passed" = "1" ]; then
-      if cargo test $opt --manifest-path libc-test/Cargo.toml --target "${TARGET}" ; then
-        passed=$((passed+1))
-        continue
-      fi
-    elif [ "$passed" = "2" ]; then
-      if cargo test $opt --features extra_traits --manifest-path libc-test/Cargo.toml --target "${TARGET}"; then
-        break
-      fi
-    fi
-    n=$((n+1))
-    sleep 1
-  done
-else
-  cargo test $opt --no-default-features --manifest-path libc-test/Cargo.toml \
-    --target "${TARGET}"
-
-  cargo test $opt --manifest-path libc-test/Cargo.toml --target "${TARGET}"
-
-  cargo test $opt --features extra_traits --manifest-path libc-test/Cargo.toml \
-    --target "${TARGET}"
-fi
+cargo test $opt --features extra_traits --manifest-path libc-test/Cargo.toml \
+  --target "${TARGET}"