Use CRANELIFT instead of CLIF in test env vars

Author: Mark McCaskey

Makefile

@@ -44,7 +44,7 @@ spectests-llvm:
 	SPECTEST_TEST_LLVM=1 cargo test test_run_spectests --release --no-default-features --features "wasi backend-llvm wasmer-llvm-backend/test" -- --nocapture
 
 spectests-all:
-	SPECTEST_TEST_CLIF=1 SPECTEST_TEST_LLVM=1 SPECTEST_TEST_SINGLEPASS=1 \
+	SPECTEST_TEST_CRANELIFT=1 SPECTEST_TEST_LLVM=1 SPECTEST_TEST_SINGLEPASS=1 \
 	cargo test test_run_spectests --release --no-default-features --features "wasi backend-cranelift backend-singlepass backend-llvm wasmer-llvm-backend/test" -- --nocapture --test-threads 1
 
 

tests/emtests/_common.rs

@@ -4,7 +4,7 @@ use wasmer_runtime::Backend;
 pub fn get_backend() -> Option<Backend> {
     #[cfg(feature = "backend-cranelift")]
     {
-        if let Ok(v) = env::var("WASMER_TEST_CLIF") {
+        if let Ok(v) = env::var("WASMER_TEST_CRANELIFT") {
             if v == "1" {
                 return Some(Backend::Cranelift);
             }
@@ -40,7 +40,7 @@ macro_rules! assert_emscripten_output {
         use wasmer_dev_utils::stdio::StdioCapturer;
 
         let wasm_bytes = include_bytes!($file);
-        let backend = $crate::emtests::_common::get_backend().expect("Please set one of `WASMER_TEST_CLIF`, `WASMER_TEST_LLVM`, or `WASMER_TEST_SINGELPASS` to `1`.");
+        let backend = $crate::emtests::_common::get_backend().expect("Please set one of `WASMER_TEST_CRANELIFT`, `WASMER_TEST_LLVM`, or `WASMER_TEST_SINGELPASS` to `1`.");
         let compiler = wasmer_runtime::compiler_for_backend(backend).expect("The desired compiler was not found!");
 
         let module = wasmer_runtime::compile_with_config_with(&wasm_bytes[..], Default::default(), &*compiler).expect("WASM can't be compiled");

tests/spectest.rs

@@ -93,7 +93,7 @@ mod tests {
 
     fn get_compilers_to_test() -> Vec<&'static str> {
         let mut out = vec![];
-        if let Ok(v) = env::var("SPECTEST_TEST_CLIF") {
+        if let Ok(v) = env::var("SPECTEST_TEST_CRANELIFT") {
             if v == "1" {
                 out.push("clif");
             }

tests/wasitests/_common.rs

@@ -4,7 +4,7 @@ use wasmer_runtime::Backend;
 pub fn get_backend() -> Option<Backend> {
     #[cfg(feature = "backend-cranelift")]
     {
-        if let Ok(v) = env::var("WASMER_TEST_CLIF") {
+        if let Ok(v) = env::var("WASMER_TEST_CRANELIFT") {
             if v == "1" {
                 return Some(Backend::Cranelift);
             }
@@ -37,7 +37,7 @@ macro_rules! assert_wasi_output {
         use wasmer_wasi::{generate_import_object_for_version, get_wasi_version};
 
         let wasm_bytes = include_bytes!($file);
-        let backend = $crate::wasitests::_common::get_backend().expect("Please set one of `WASMER_TEST_CLIF`, `WASMER_TEST_LLVM`, or `WASMER_TEST_SINGELPASS` to `1`.");
+        let backend = $crate::wasitests::_common::get_backend().expect("Please set one of `WASMER_TEST_CRANELIFT`, `WASMER_TEST_LLVM`, or `WASMER_TEST_SINGELPASS` to `1`.");
         let compiler = wasmer_runtime::compiler_for_backend(backend).expect("The desired compiler was not found!");
 
         let module = wasmer_runtime::compile_with_config_with(&wasm_bytes[..], Default::default(), &*compiler).expect("WASM can't be compiled");