Run emscripten tests with both compilers

Cargo.lock

@@ -1326,6 +1326,7 @@ dependencies = [
  "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
  "wabt 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "wasmer-clif-backend 0.2.0",
+ "wasmer-llvm-backend 0.1.0",
  "wasmer-runtime-core 0.2.1",
 ]
 

Makefile

@@ -45,7 +45,8 @@ test:
 	cargo test -p wasmer-runtime-c-api -- --nocapture
 
 test-emscripten:
-	cargo test -p wasmer-emscripten -- --test-threads=1 $(runargs)
+	cargo test --manifest-path lib/spectests/Cargo.toml --features clif -- --test-threads=1 $(runargs)
+	cargo test --manifest-path lib/spectests/Cargo.toml --features llvm -- --test-threads=1 $(runargs)
 
 release:
 	# If you are in OS-X, you will need mingw-w64 for cross compiling to windows

lib/emscripten/Cargo.toml

@@ -20,7 +20,12 @@ rand = "0.6"
 
 [dev-dependencies]
 wasmer-clif-backend = { path = "../clif-backend", version = "0.2.0" }
+wasmer-llvm-backend = { path = "../llvm-backend", version = "0.1.0" }
 wabt = "0.7.2"
 
 [build-dependencies]
 glob = "0.2.11"
+
+[features]
+clif = []
+llvm = []

lib/emscripten/src/utils.rs

@@ -169,15 +169,34 @@ mod tests {
     use super::is_emscripten_module;
     use std::sync::Arc;
     use wabt::wat2wasm;
-    use wasmer_clif_backend::CraneliftCompiler;
+    use wasmer_runtime_core::backend::Compiler;
     use wasmer_runtime_core::compile_with;
 
+    #[cfg(feature = "clif")]
+    fn get_compiler() -> impl Compiler {
+        use wasmer_clif_backend::CraneliftCompiler;
+        CraneliftCompiler::new()
+    }
+
+    #[cfg(feature = "llvm")]
+    fn get_compiler() -> impl Compiler {
+        use wasmer_llvm_backend::LLVMCompiler;
+        LLVMCompiler::new()
+    }
+
+    #[cfg(not(any(feature = "llvm", feature = "clif")))]
+    fn get_compiler() -> impl Compiler {
+        panic!("compiler not specified, activate a compiler via features");
+        use wasmer_clif_backend::CraneliftCompiler;
+        CraneliftCompiler::new()
+    }
+
     #[test]
     fn should_detect_emscripten_files() {
         const WAST_BYTES: &[u8] = include_bytes!("tests/is_emscripten_true.wast");
         let wasm_binary = wat2wasm(WAST_BYTES.to_vec()).expect("Can't convert to wasm");
-        let module = compile_with(&wasm_binary[..], &CraneliftCompiler::new())
+        let module =
-            .expect("WASM can't be compiled");
+            compile_with(&wasm_binary[..], &get_compiler()).expect("WASM can't be compiled");
         let module = Arc::new(module);
         assert!(is_emscripten_module(&module));
     }
@@ -186,8 +205,8 @@ mod tests {
     fn should_detect_non_emscripten_files() {
         const WAST_BYTES: &[u8] = include_bytes!("tests/is_emscripten_false.wast");
         let wasm_binary = wat2wasm(WAST_BYTES.to_vec()).expect("Can't convert to wasm");
-        let module = compile_with(&wasm_binary[..], &CraneliftCompiler::new())
+        let module =
-            .expect("WASM can't be compiled");
+            compile_with(&wasm_binary[..], &get_compiler()).expect("WASM can't be compiled");
         let module = Arc::new(module);
         assert!(!is_emscripten_module(&module));
     }

lib/emscripten/tests/emtests/_common.rs

@@ -1,16 +1,35 @@
 macro_rules! assert_emscripten_output {
     ($file:expr, $name:expr, $args:expr, $expected:expr) => {{
 
-        use wasmer_clif_backend::CraneliftCompiler;
         use wasmer_emscripten::{
             EmscriptenGlobals,
             generate_emscripten_env,
             stdio::StdioCapturer
         };
+        use wasmer_runtime_core::backend::Compiler;
+
+        #[cfg(feature = "clif")]
+        fn get_compiler() -> impl Compiler {
+            use wasmer_clif_backend::CraneliftCompiler;
+            CraneliftCompiler::new()
+        }
+
+        #[cfg(feature = "llvm")]
+        fn get_compiler() -> impl Compiler {
+            use wasmer_llvm_backend::LLVMCompiler;
+            LLVMCompiler::new()
+        }
+
+        #[cfg(not(any(feature = "llvm", feature = "clif")))]
+        fn get_compiler() -> impl Compiler {
+            panic!("compiler not specified, activate a compiler via features");
+            use wasmer_clif_backend::CraneliftCompiler;
+            CraneliftCompiler::new()
+        }
 
         let wasm_bytes = include_bytes!($file);
 
-        let module = wasmer_runtime_core::compile_with(&wasm_bytes[..], &CraneliftCompiler::new())
+        let module = wasmer_runtime_core::compile_with(&wasm_bytes[..], &get_compiler())
             .expect("WASM can't be compiled");
 
 //        let module = compile(&wasm_bytes[..])