Move most wasmtime tests into one test suite (#1544)

* Move most wasmtime tests into one test suite This commit moves most wasmtime tests into a single test suite which gets compiled into one executable instead of having lots of test executables. The goal here is to reduce disk space on CI, and this should be achieved by having fewer executables which means fewer copies of `libwasmtime.rlib` linked across binaries on the system. More importantly though this means that DWARF debug information should only be in one executable rather than duplicated across many. * Share more build caches Globally set `RUSTFLAGS` to `-Dwarnings` instead of individually so all build steps share the same value. * Allow some dead code in cranelift-codegen Prevents having to fix all warnings for all possible feature combinations, only the main ones which come up. * Update some debug file paths
veracruz-project · Apr 17, 2020 · 4c82da4 · 4c82da4
1 parent a524f58
commit 4c82da4
Show file tree

Hide file tree

Showing 39 changed files with 48 additions and 33 deletions.
diff --git a/.github/actions/install-rust/main.js b/.github/actions/install-rust/main.js
@@ -12,6 +12,9 @@ child_process.execFileSync('rustup', ['set', 'profile', 'minimal']);
 child_process.execFileSync('rustup', ['update', toolchain, '--no-self-update']);
 child_process.execFileSync('rustup', ['default', toolchain]);
 
+// Deny warnings on CI to keep our code warning-free as it lands in-tree
+console.log(`::set-env name=RUSTFLAGS::-D warnings`);
+
 // Save disk space by avoiding incremental compilation, and also we don't use
 // any caching so incremental wouldn't help anyway.
 console.log(`::set-env name=CARGO_INCREMENTAL::0`);

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -228,14 +228,12 @@ jobs:
     - run: cargo test --features test-programs/test_programs --all --exclude lightbeam -- --nocapture
       env:
         RUST_BACKTRACE: 1
-        RUSTFLAGS: "-D warnings"
 
     # Test debug (DWARF) related functionality.
     - run: cargo test test_debug_dwarf_ -- --ignored --nocapture --test-threads 1
       if: matrix.os == 'ubuntu-latest'
       env:
         RUST_BACKTRACE: 1
-        RUSTFLAGS: "-D warnings"
 
     # Build and test lightbeam if we're using the nightly toolchain. Note that
     # Lightbeam tests fail right now, but we don't want to block on that.

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -41,11 +41,12 @@ libc = "0.2.60"
 rayon = "1.2.1"
 
 [dev-dependencies]
-wasmtime-runtime = { path = "crates/runtime", version = "0.15.0" }
+filecheck = "0.5.0"
 more-asserts = "0.2.1"
-test-programs = { path = "crates/test-programs" }
 tempfile = "3.1.0"
-filecheck = "0.5.0"
+test-programs = { path = "crates/test-programs" }
+wasmtime-fuzzing = { path = "crates/fuzzing" }
+wasmtime-runtime = { path = "crates/runtime" }
 
 [build-dependencies]
 anyhow = "1.0.19"
@@ -79,3 +80,7 @@ vtune = ["wasmtime/vtune"]
 
 [badges]
 maintenance = { status = "actively-developed" }
+
+[[test]]
+name = "host_segfault"
+harness = false
diff --git a/build.rs b/build.rs
@@ -157,7 +157,7 @@ fn write_testsuite_tests(
     writeln!(out, "fn r#{}() -> anyhow::Result<()> {{", &testname)?;
     writeln!(
         out,
-        "crate::run_wast(r#\"{}\"#, crate::Strategy::{})",
+        "crate::wast::run_wast(r#\"{}\"#, crate::wast::Strategy::{})",
         path.display(),
         strategy
     )?;

diff --git a/cranelift/codegen/src/lib.rs b/cranelift/codegen/src/lib.rs
@@ -39,6 +39,13 @@
     )
 )]
 #![no_std]
+// Various bits and pieces of this crate might only be used for one platform or
+// another, but it's not really too useful to learn about that all the time. On
+// CI we build at least one version of this crate with `--features all-arch`
+// which means we'll always detect truly dead code, otherwise if this is only
+// built for one platform we don't have to worry too much about trimming
+// everything down.
+#![cfg_attr(not(feature = "all-arch"), allow(dead_code))]
 
 #[allow(unused_imports)] // #[macro_use] is required for no_std
 #[macro_use]

diff --git a/crates/api/Cargo.toml b/crates/api/Cargo.toml
@@ -29,13 +29,7 @@ wat = { version = "1.0.10", optional = true }
 winapi = "0.3.7"
 
 [dev-dependencies]
-# for wasmtime.rs
-wasi-common = { path = "../wasi-common", version = "0.15.0" }
-pretty_env_logger = "0.4.0"
-rayon = "1.2.1"
-file-per-thread-logger = "0.1.1"
-wat = "1.0.10"
-tempfile = "3.1"
+tempfile = "3.0"
 
 [badges]
 maintenance = { status = "actively-developed" }
@@ -53,7 +47,3 @@ jitdump = ["wasmtime-jit/jitdump"]
 
 # Enables support for the `VTune` profiler
 vtune = ["wasmtime-jit/vtune"]
-
-[[test]]
-name = "host-segfault"
-harness = false
diff --git a/crates/fuzzing/src/lib.rs b/crates/fuzzing/src/lib.rs
@@ -24,10 +24,9 @@ pub(crate) fn init_fuzzing() {
     INIT.call_once(|| {
         let _ = env_logger::try_init();
 
-        rayon::ThreadPoolBuilder::new()
+        let _ = rayon::ThreadPoolBuilder::new()
             .num_threads(1)
-            .build_global()
-            .expect("should only initialize the rayon thread pool once!");
+            .build_global();
     })
 }
 

diff --git a/tests/cli_tests.rs → tests/all/cli_tests.rs b/tests/cli_tests.rs → tests/all/cli_tests.rs
diff --git a/tests/custom_signal_handler.rs → tests/all/custom_signal_handler.rs b/tests/custom_signal_handler.rs → tests/all/custom_signal_handler.rs
diff --git a/tests/debug/dump.rs → tests/all/debug/dump.rs b/tests/debug/dump.rs → tests/all/debug/dump.rs
diff --git a/tests/debug/lldb.rs → tests/all/debug/lldb.rs b/tests/debug/lldb.rs → tests/all/debug/lldb.rs
@@ -63,7 +63,7 @@ pub fn test_debug_dwarf_lldb() -> Result<()> {
     let output = lldb_with_script(
         &[
             "-g",
-            "tests/debug/testsuite/fib-wasm.wasm",
+            "tests/all/debug/testsuite/fib-wasm.wasm",
             "--invoke",
             "fib",
             "3",
@@ -105,7 +105,7 @@ pub fn test_debug_dwarf_ptr() -> Result<()> {
             "-g",
             "--opt-level",
             "0",
-            "tests/debug/testsuite/reverse-str.wasm",
+            "tests/all/debug/testsuite/reverse-str.wasm",
         ],
         r#"b reverse-str.c:9
 r

diff --git a/tests/debug/main.rs → tests/all/debug/mod.rs b/tests/debug/main.rs → tests/all/debug/mod.rs
diff --git a/tests/debug/obj.rs → tests/all/debug/obj.rs b/tests/debug/obj.rs → tests/all/debug/obj.rs
diff --git a/tests/debug/simulate.rs → tests/all/debug/simulate.rs b/tests/debug/simulate.rs → tests/all/debug/simulate.rs
diff --git a/tests/debug/testsuite/fib-wasm.c → tests/all/debug/testsuite/fib-wasm.c b/tests/debug/testsuite/fib-wasm.c → tests/all/debug/testsuite/fib-wasm.c
diff --git a/tests/debug/testsuite/fib-wasm.wasm → tests/all/debug/testsuite/fib-wasm.wasm b/tests/debug/testsuite/fib-wasm.wasm → tests/all/debug/testsuite/fib-wasm.wasm
diff --git a/tests/debug/testsuite/reverse-str.c → tests/all/debug/testsuite/reverse-str.c b/tests/debug/testsuite/reverse-str.c → tests/all/debug/testsuite/reverse-str.c
diff --git a/tests/debug/testsuite/reverse-str.wasm → tests/all/debug/testsuite/reverse-str.wasm b/tests/debug/testsuite/reverse-str.wasm → tests/all/debug/testsuite/reverse-str.wasm
diff --git a/tests/debug/translate.rs → tests/all/debug/translate.rs b/tests/debug/translate.rs → tests/all/debug/translate.rs
@@ -32,7 +32,7 @@ fn check_wasm(wasm_path: &str, directives: &str) -> Result<()> {
 ))]
 fn test_debug_dwarf_translate() -> Result<()> {
     check_wasm(
-        "tests/debug/testsuite/fib-wasm.wasm",
+        "tests/all/debug/testsuite/fib-wasm.wasm",
         r##"
 check: DW_TAG_compile_unit
 # We have "fib" function

diff --git a/crates/api/tests/externals.rs → tests/all/externals.rs b/crates/api/tests/externals.rs → tests/all/externals.rs
diff --git a/crates/api/tests/func.rs → tests/all/func.rs b/crates/api/tests/func.rs → tests/all/func.rs
diff --git a/crates/fuzzing/tests/regressions.rs → tests/all/fuzzing.rs b/crates/fuzzing/tests/regressions.rs → tests/all/fuzzing.rs
@@ -1,29 +1,29 @@
 //! Regression tests for bugs found via fuzzing.
 //!
 //! The `#[test]` goes in here, the Wasm binary goes in
-//! `./regressions/some-descriptive-name.wasm`, and then the `#[test]` should
+//! `./fuzzing/some-descriptive-name.wasm`, and then the `#[test]` should
 //! use the Wasm binary by including it via
-//! `include_bytes!("./regressions/some-descriptive-name.wasm")`.
+//! `include_bytes!("./fuzzing/some-descriptive-name.wasm")`.
 
 use wasmtime::{Config, Strategy};
 use wasmtime_fuzzing::oracles;
 
 #[test]
 fn instantiate_empty_module() {
-    let data = wat::parse_str(include_str!("./regressions/empty.wat")).unwrap();
+    let data = wat::parse_str(include_str!("./fuzzing/empty.wat")).unwrap();
     oracles::instantiate(&data, Strategy::Auto);
 }
 
 #[test]
 fn instantiate_empty_module_with_memory() {
-    let data = wat::parse_str(include_str!("./regressions/empty_with_memory.wat")).unwrap();
+    let data = wat::parse_str(include_str!("./fuzzing/empty_with_memory.wat")).unwrap();
     oracles::instantiate(&data, Strategy::Auto);
 }
 
 #[test]
 fn instantiate_module_that_compiled_to_x64_has_register_32() {
     let mut config = Config::new();
     config.debug_info(true);
-    let data = wat::parse_str(include_str!("./regressions/issue694.wat")).unwrap();
+    let data = wat::parse_str(include_str!("./fuzzing/issue694.wat")).unwrap();
     oracles::instantiate_with_config(&data, config);
 }
diff --git a/crates/fuzzing/tests/regressions/README.md → tests/all/fuzzing/README.md b/crates/fuzzing/tests/regressions/README.md → tests/all/fuzzing/README.md
@@ -1,2 +1,2 @@
 This directory contains `.wasm` binaries generated during fuzzing that uncovered
-a bug, and which we now use as regression tests in `../regressions.rs`.
+a bug, and which we now use as regression tests in `../fuzzing.rs`.
diff --git a/crates/fuzzing/tests/regressions/empty.wat → tests/all/fuzzing/empty.wat b/crates/fuzzing/tests/regressions/empty.wat → tests/all/fuzzing/empty.wat
diff --git a/...g/tests/regressions/empty_with_memory.wat → tests/all/fuzzing/empty_with_memory.wat b/...g/tests/regressions/empty_with_memory.wat → tests/all/fuzzing/empty_with_memory.wat
diff --git a/...es/fuzzing/tests/regressions/issue694.wat → tests/all/fuzzing/issue694.wat b/...es/fuzzing/tests/regressions/issue694.wat → tests/all/fuzzing/issue694.wat
diff --git a/crates/api/tests/globals.rs → tests/all/globals.rs b/crates/api/tests/globals.rs → tests/all/globals.rs
diff --git a/crates/api/tests/import_calling_export.rs → tests/all/import_calling_export.rs b/crates/api/tests/import_calling_export.rs → tests/all/import_calling_export.rs
diff --git a/crates/api/tests/import-indexes.rs → tests/all/import_indexes.rs b/crates/api/tests/import-indexes.rs → tests/all/import_indexes.rs
diff --git a/crates/api/tests/instance.rs → tests/all/instance.rs b/crates/api/tests/instance.rs → tests/all/instance.rs
diff --git a/crates/api/tests/invoke_func_via_table.rs → tests/all/invoke_func_via_table.rs b/crates/api/tests/invoke_func_via_table.rs → tests/all/invoke_func_via_table.rs
diff --git a/crates/api/tests/linker.rs → tests/all/linker.rs b/crates/api/tests/linker.rs → tests/all/linker.rs
diff --git a/tests/all/main.rs b/tests/all/main.rs
@@ -0,0 +1,16 @@
+mod cli_tests;
+mod custom_signal_handler;
+mod debug;
+mod externals;
+mod func;
+mod fuzzing;
+mod globals;
+mod import_calling_export;
+mod import_indexes;
+mod instance;
+mod invoke_func_via_table;
+mod linker;
+mod memory_creator;
+mod name;
+mod traps;
+mod wast;
diff --git a/crates/api/tests/memory_creator.rs → tests/all/memory_creator.rs b/crates/api/tests/memory_creator.rs → tests/all/memory_creator.rs
diff --git a/crates/api/tests/name.rs → tests/all/name.rs b/crates/api/tests/name.rs → tests/all/name.rs
diff --git a/crates/api/tests/traps.rs → tests/all/traps.rs b/crates/api/tests/traps.rs → tests/all/traps.rs
diff --git a/tests/wast_testsuites.rs → tests/all/wast.rs b/tests/wast_testsuites.rs → tests/all/wast.rs
diff --git a/crates/api/tests/host-segfault.rs → tests/host_segfault.rs b/crates/api/tests/host-segfault.rs → tests/host_segfault.rs