language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-26 13:29:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

fix test panic output formatting

Browse source
This commit is contained in:
Folkert 2022-07-22 13:33:52 +02:00
parent 0e56753bf1
commit ccd8821acf
No known key found for this signature in database
GPG key ID: 1F17F6FFD112B97C
2 changed files with 18 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

16
crates/compiler/gen_llvm/src/run_roc.rs
View file

@ -75,10 +75,10 @@ macro_rules! try_run_jit_function {
try_run_jit_function!($lib, $main_fn_name, $ty, $transform, v)
}};
($lib: expr, $main_fn_name: expr, $ty:ty, $transform:expr, $errors:expr) => {{
try_run_jit_function!($lib, $main_fn_name, $ty, $transform, $errors, &[])
($lib: expr, $main_fn_name: expr, $ty:ty, $transform:expr) => {{
try_run_jit_function!($lib, $main_fn_name, $ty, $transform, &[])
}};
($lib: expr, $main_fn_name: expr, $ty:ty, $transform:expr, $errors:expr, $expect_failures:expr) => {{
($lib: expr, $main_fn_name: expr, $ty:ty, $transform:expr, $expect_failures:expr) => {{
use inkwell::context::Context;
use roc_builtins::bitcode;
use roc_gen_llvm::run_roc::RocCallResult;
@ -110,14 +110,8 @@ macro_rules! run_jit_function {
run_jit_function!($lib, $main_fn_name, $ty, $transform, $errors, &[])
}};
($lib: expr, $main_fn_name: expr, $ty:ty, $transform:expr, $errors:expr, $expect_failures:expr) => {{
let result = $crate::try_run_jit_function!(
$lib,
$main_fn_name,
$ty,
$transform,
$errors,
$expect_failures
);
let result =
$crate::try_run_jit_function!($lib, $main_fn_name, $ty, $transform, $expect_failures);
match result {
Ok(success) => {

15
crates/compiler/test_gen/src/helpers/llvm.rs
View file

@ -516,7 +516,7 @@ macro_rules! assert_llvm_evals_to {
use bumpalo::Bump;
use inkwell::context::Context;
use roc_gen_llvm::llvm::build::LlvmBackendMode;
use roc_gen_llvm::run_jit_function;
use roc_gen_llvm::try_run_jit_function;
let arena = Bump::new();
let context = Context::create();
@ -537,7 +537,18 @@ macro_rules! assert_llvm_evals_to {
let given = $transform(success);
assert_eq!(&given, &expected, "LLVM test failed");
};
run_jit_function!(lib, main_fn_name, $ty, transform, errors)
let result = try_run_jit_function!(lib, main_fn_name, $ty, transform, errors);
match result {
Ok(raw) => {
// only if there are no exceptions thrown, check for errors
assert!(errors.is_empty(), "Encountered errors:\n{}", errors);
transform(raw)
}
Err(msg) => panic!("Roc failed with message: \"{}\"", msg),
}
};
($src:expr, $expected:expr, $ty:ty) => {