From 15e277a21723db07692cfd589bd87146301a97c6 Mon Sep 17 00:00:00 2001 From: Thibaut Lorrain Date: Tue, 26 Nov 2024 18:09:20 +0100 Subject: [PATCH] Revert "Disable proc macro tests for tvOS and watchOS" This reverts commit 3244bc9b01410a9c090240c75db2ae51fb13f1b6. This can be reenabled as https://github.com/rust-lang/cargo/issues/14735 was fixed via https://github.com/rust-lang/cargo/pull/14850 --- .travis.apple-third-tier.sh | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.travis.apple-third-tier.sh b/.travis.apple-third-tier.sh index 64cdcaa..6e05cf2 100755 --- a/.travis.apple-third-tier.sh +++ b/.travis.apple-third-tier.sh @@ -25,17 +25,14 @@ tests_sequence_unstable_target() { # There's something odd with using the .cargo/config runner attribute and # workspaces when the runner uses `cargo run --manifest-path ../Cargo.toml # --bin cargo-dinghy ...` - # TODO 2024/11/18 adding explict `--workspace --exclude test-proc-macro` to the cargo commands here - # TODO as a workaround for https://github.com/rust-lang/cargo/issues/14735 this should be removed when the issue - # TODO is resolved title "testing from project directory for rust target $1 on device $2" title "testing from workspace directory" ( \ cd test-ws \ && cargo clean \ - && $CARGO_DINGHY -d $1 -p $2 +nightly test --workspace --exclude test-proc-macro -Zbuild-std pass \ - && ! $CARGO_DINGHY -d $1 -p $2 +nightly test --workspace --exclude test-proc-macro -Zbuild-std fails \ - && ! $CARGO_DINGHY -d $1 -p $2 +nightly test --workspace --exclude test-proc-macro -Zbuild-std \ + && $CARGO_DINGHY -d $1 -p $2 +nightly test -Zbuild-std pass \ + && ! $CARGO_DINGHY -d $1 -p $2 +nightly test -Zbuild-std fails \ + && ! $CARGO_DINGHY -d $1 -p $2 +nightly test -Zbuild-std \ ) title "testing from project directory"