changes to run test suite in wasmtime

run-make still fails but that's all hardcoded for node

Author: alexcrichton

src/bootstrap/config.rs

@@ -407,6 +407,7 @@ pub struct Target {
     pub wasi_root: Option<PathBuf>,
     pub qemu_rootfs: Option<PathBuf>,
     pub no_std: bool,
+    pub runtool: Option<String>,
 }
 
 impl Target {
@@ -746,6 +747,7 @@ define_config! {
         wasi_root: Option<String> = "wasi-root",
         qemu_rootfs: Option<String> = "qemu-rootfs",
         no_std: Option<bool> = "no-std",
+        runtool: Option<String> = "runtool",
     }
 }
 
@@ -1175,6 +1177,9 @@ impl Config {
                 if let Some(s) = cfg.no_std {
                     target.no_std = s;
                 }
+                if let Some(s) = &cfg.runtool {
+                    target.runtool = Some(s.clone());
+                }
                 target.cc = cfg.cc.map(PathBuf::from);
                 target.cxx = cfg.cxx.map(PathBuf::from);
                 target.ar = cfg.ar.map(PathBuf::from);

src/bootstrap/test.rs

@@ -1606,6 +1606,12 @@ note: if you're sure you want to do this, please open an issue as to why. In the
             cmd.arg("--rustfix-coverage");
         }
 
+        if let Some(config) = builder.config.target_config.get(&target) {
+            if let Some(tool) = &config.runtool {
+                cmd.arg("--runtool").arg(tool);
+            }
+        }
+
         cmd.env("BOOTSTRAP_CARGO", &builder.initial_cargo);
 
         cmd.arg("--channel").arg(&builder.config.channel);
@@ -2030,12 +2036,15 @@ impl Step for Crate {
             cargo.arg("--quiet");
         }
 
-        if target.contains("emscripten") {
+        let runtool = builder.config.target_config.get(&target).and_then(|t| t.runtool.as_ref());
+        if let Some(tool) = runtool {
+            cargo.env(format!("CARGO_TARGET_{}_RUNNER", envify(&target.triple)), tool);
+        } else if target.contains("emscripten") {
             cargo.env(
                 format!("CARGO_TARGET_{}_RUNNER", envify(&target.triple)),
                 builder.config.nodejs.as_ref().expect("nodejs not configured"),
             );
-        } else if target.starts_with("wasm32") {
+        } else if target == "wasm32-unknown-unknown" {
             let node = builder.config.nodejs.as_ref().expect("nodejs not configured");
             let runner =
                 format!("{} {}/src/etc/wasm32-shim.js", node.display(), builder.src.display());

src/ci/docker/host-x86_64/test-various/Dockerfile

@@ -18,7 +18,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins
   wget \
   patch
 
-RUN curl -sL https://nodejs.org/dist/v15.14.0/node-v15.14.0-linux-x64.tar.xz | \
+RUN curl -sL https://github.com/bytecodealliance/wasmtime/releases/download/v1.0.0/wasmtime-v1.0.0-x86_64-linux.tar.xz | \
   tar -xJ
 
 WORKDIR /build/

src/tools/compiletest/src/header.rs

@@ -674,7 +674,9 @@ impl Config {
         // (in contrast to `wasm32` which also matches non-bare targets like
         // asmjs-unknown-emscripten).
         let matches_wasm32_alias = || {
-            self.target == "wasm32-unknown-unknown" && matches!(name, "emscripten" | "wasm32-bare")
+            (self.target == "wasm32-unknown-unknown"
+                && matches!(name, "emscripten" | "wasm32-bare"))
+                || (self.target == "wasm32-wasi" && matches!(name, "emscripten"))
         };
 
         let is_match = name == "test" ||
@@ -950,7 +952,7 @@ pub fn make_test_description<R: Read>(
         ignore |= !has_shadow_call_stack
             && config.parse_name_directive(ln, "needs-sanitizer-shadow-call-stack");
         ignore |= !config.can_unwind() && config.parse_name_directive(ln, "needs-unwind");
-        ignore |= config.target == "wasm32-unknown-unknown"
+        ignore |= config.target.contains("wasm32")
             && config.parse_name_directive(ln, directives::CHECK_RUN_RESULTS);
         ignore |= config.debugger == Some(Debugger::Cdb) && ignore_cdb(config, ln);
         ignore |= config.debugger == Some(Debugger::Gdb) && ignore_gdb(config, ln);

src/tools/compiletest/src/runtest.rs

@@ -2094,7 +2094,7 @@ impl<'test> TestCx<'test> {
             }
         // If this is otherwise wasm, then run tests under nodejs with our
         // shim
-        } else if self.config.target.contains("wasm32") {
+        } else if self.config.target == "wasm32-unknown-unknown" {
             if let Some(ref p) = self.config.nodejs {
                 args.push(p.clone());
             } else {