From 2f483563953f1d2acf7ec9ef68455f7455046b97 Mon Sep 17 00:00:00 2001 From: Dan Gohman Date: Thu, 22 Aug 2019 10:56:38 -0700 Subject: [PATCH 1/2] Only test wasmtime-py and wasmtime-rust if nightly is installed. --- test-all.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/test-all.sh b/test-all.sh index fcbbaf6e3924..123ab4a854bc 100755 --- a/test-all.sh +++ b/test-all.sh @@ -62,10 +62,6 @@ RUST_BACKTRACE=1 cargo test \ --package wasmtime-interface-types \ --package wasmtime-obj \ -RUST_BACKTRACE=1 cargo +nightly test \ - --package wasmtime-py \ - --package wasmtime-rust - # Make sure the documentation builds. banner "Rust documentation: $topdir/target/doc/wasmtime/index.html" cargo doc @@ -89,6 +85,11 @@ if rustup toolchain list | grep -q nightly; then # Nightly is available, so also run lightbeam's tests, which we # skipped earlier. cargo +nightly test --package lightbeam + + # Also run wasmtie-py and wasmtime-rust's tests. + RUST_BACKTRACE=1 cargo +nightly test \ + --package wasmtime-py \ + --package wasmtime-rust else echo "nightly toolchain not found, skipping fuzz target integration test" fi From 458ae859000fc6ab98ee748ba09629a59173e444 Mon Sep 17 00:00:00 2001 From: Dan Gohman Date: Thu, 22 Aug 2019 11:03:02 -0700 Subject: [PATCH 2/2] Update test-all.sh Co-Authored-By: bjorn3 --- test-all.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-all.sh b/test-all.sh index 123ab4a854bc..58c97dec82bb 100755 --- a/test-all.sh +++ b/test-all.sh @@ -86,7 +86,7 @@ if rustup toolchain list | grep -q nightly; then # skipped earlier. cargo +nightly test --package lightbeam - # Also run wasmtie-py and wasmtime-rust's tests. + # Also run wasmtime-py and wasmtime-rust's tests. RUST_BACKTRACE=1 cargo +nightly test \ --package wasmtime-py \ --package wasmtime-rust