diff --git a/compiler/test_gen/src/gen_primitives.rs b/compiler/test_gen/src/gen_primitives.rs index 2f97c23753..3fcc8ea143 100644 --- a/compiler/test_gen/src/gen_primitives.rs +++ b/compiler/test_gen/src/gen_primitives.rs @@ -3,8 +3,6 @@ use crate::helpers::llvm::assert_evals_to; #[cfg(feature = "gen-llvm")] use crate::helpers::llvm::assert_expect_failed; #[cfg(feature = "gen-llvm")] -use crate::helpers::llvm::assert_llvm_evals_to; -#[cfg(feature = "gen-llvm")] use crate::helpers::llvm::assert_non_opt_evals_to; #[cfg(feature = "gen-dev")] @@ -2473,7 +2471,7 @@ fn function_malformed_pattern() { #[cfg(any(feature = "gen-llvm"))] #[should_panic(expected = "Hit an erroneous type when creating a layout for")] fn call_invalid_layout() { - assert_llvm_evals_to!( + assert_evals_to!( indoc!( r#" f : I64 -> I64 diff --git a/compiler/test_gen/src/helpers/llvm.rs b/compiler/test_gen/src/helpers/llvm.rs index d9af1a821d..91cad5b6da 100644 --- a/compiler/test_gen/src/helpers/llvm.rs +++ b/compiler/test_gen/src/helpers/llvm.rs @@ -590,19 +590,31 @@ macro_rules! assert_llvm_evals_to { #[allow(unused_macros)] macro_rules! assert_evals_to { ($src:expr, $expected:expr, $ty:ty) => {{ - assert_evals_to!($src, $expected, $ty, $crate::helpers::llvm::identity); + assert_evals_to!($src, $expected, $ty, $crate::helpers::llvm::identity, false); }}; - ($src:expr, $expected:expr, $ty:ty, $transform:expr) => { + ($src:expr, $expected:expr, $ty:ty, $transform:expr) => {{ // same as above, except with an additional transformation argument. - { - #[cfg(feature = "wasm-cli-run")] - $crate::helpers::llvm::assert_wasm_evals_to!( - $src, $expected, $ty, $transform, false, false - ); + assert_evals_to!($src, $expected, $ty, $transform, false); + }}; + ($src:expr, $expected:expr, $ty:ty, $transform:expr, $ignore_problems: expr) => {{ + // same as above, except with ignore_problems. + #[cfg(feature = "wasm-cli-run")] + $crate::helpers::llvm::assert_wasm_evals_to!( + $src, + $expected, + $ty, + $transform, + $ignore_problems + ); - $crate::helpers::llvm::assert_llvm_evals_to!($src, $expected, $ty, $transform, false); - } - }; + $crate::helpers::llvm::assert_llvm_evals_to!( + $src, + $expected, + $ty, + $transform, + $ignore_problems + ); + }}; } #[allow(unused_macros)]