squiid/rust-libc
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Auto merge of #2289 - JohnTitor:no-more-opt-build, r=JohnTitor

Browse source 
Do debug build for `x86_64-unknown-linux-gnux32`

The mentioned issue has been fixed, let's see if we can remove the `--release` flag.
r? `@ghost`
This commit is contained in:
bors 2021-07-16 01:37:09 +00:00
parent 9ac03a6b2f 7306620976
commit dc576de92c
1 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
ci/run.sh
View file

@ -82,13 +82,6 @@ if [ "$QEMU" != "" ]; then
exec egrep "^(PASSED)|(test result: ok)" "${CARGO_TARGET_DIR}/out.log" exec egrep "^(PASSED)|(test result: ok)" "${CARGO_TARGET_DIR}/out.log"
fi 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 if [ "$TARGET" = "s390x-unknown-linux-gnu" ]; then
# FIXME: s390x-unknown-linux-gnu often fails to test due to timeout, # FIXME: s390x-unknown-linux-gnu often fails to test due to timeout,
# so we retry this N times. # so we retry this N times.
@ -103,12 +96,12 @@ if [ "$TARGET" = "s390x-unknown-linux-gnu" ]; then
continue continue
fi fi
elif [ "$passed" = "1" ]; then elif [ "$passed" = "1" ]; then
if cargo test $opt --manifest-path libc-test/Cargo.toml --target "${TARGET}" ; then if cargo test --manifest-path libc-test/Cargo.toml --target "${TARGET}" ; then
passed=$((passed+1)) passed=$((passed+1))
continue continue
fi fi
elif [ "$passed" = "2" ]; then elif [ "$passed" = "2" ]; then
if cargo test $opt --features extra_traits --manifest-path libc-test/Cargo.toml --target "${TARGET}"; then if cargo test --features extra_traits --manifest-path libc-test/Cargo.toml --target "${TARGET}"; then
break break
fi fi
fi fi
@ -116,11 +109,11 @@ if [ "$TARGET" = "s390x-unknown-linux-gnu" ]; then
sleep 1 sleep 1
done done
else else
cargo test $opt --no-default-features --manifest-path libc-test/Cargo.toml \ cargo test --no-default-features --manifest-path libc-test/Cargo.toml \
--target "${TARGET}" --target "${TARGET}"
cargo test $opt --manifest-path libc-test/Cargo.toml --target "${TARGET}" cargo test --manifest-path libc-test/Cargo.toml --target "${TARGET}"
RUST_BACKTRACE=1 cargo test $opt --features extra_traits --manifest-path libc-test/Cargo.toml \ RUST_BACKTRACE=1 cargo test --features extra_traits --manifest-path libc-test/Cargo.toml \
--target "${TARGET}" --target "${TARGET}"
fi fi