language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-29 14:54:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

add flag to not fail on problems (so we can see runtime errors in action)

Browse source
This commit is contained in:
Folkert 2021-03-29 16:07:30 +02:00
parent bbeb89d027
commit 9c56fbc6d1
2 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

11
compiler/test_gen/src/gen_primitives.rs
View file

@ -2278,11 +2278,9 @@ fn function_malformed_pattern() {
} }
#[test] #[test]
#[should_panic( #[should_panic(expected = "Hit an erroneous type when creating a layout for `#UserApp.f`")]
expected = "Shadowing { original_region: |L 3-3, C 4-5|, shadow: |L 5-5, C 6-7| Ident(\\\"x\\\") }"
)]
fn call_invalid_layout() { fn call_invalid_layout() {
assert_evals_to!( assert_llvm_evals_to!(
indoc!( indoc!(
r#" r#"
f : I64 -> I64 f : I64 -> I64
@ -2292,6 +2290,9 @@ fn call_invalid_layout() {
"# "#
), ),
3, 3,
i64 i64,
|x| x,
false,
true
); );
} }

13
compiler/test_gen/src/helpers/eval.rs
View file

@ -37,6 +37,7 @@ pub fn helper<'a>(
src: &str, src: &str,
stdlib: &'a roc_builtins::std::StdLib, stdlib: &'a roc_builtins::std::StdLib,
leak: bool, leak: bool,
ignore_problems: bool,
context: &'a inkwell::context::Context, context: &'a inkwell::context::Context,
) -> (&'static str, String, Library) { ) -> (&'static str, String, Library) {
use roc_gen::llvm::build::{build_proc, build_proc_header, Scope}; use roc_gen::llvm::build::{build_proc, build_proc_header, Scope};
@ -170,7 +171,7 @@ pub fn helper<'a>(
println!("{}", lines.join("\n")); println!("{}", lines.join("\n"));
// only crash at this point if there were no delayed_errors // only crash at this point if there were no delayed_errors
if delayed_errors.is_empty() { if delayed_errors.is_empty() && !ignore_problems {
assert_eq!(0, 1, "Mistakes were made"); assert_eq!(0, 1, "Mistakes were made");
} }
} }
@ -331,7 +332,7 @@ pub fn helper<'a>(
#[macro_export] #[macro_export]
macro_rules! assert_llvm_evals_to { macro_rules! assert_llvm_evals_to {
($src:expr, $expected:expr, $ty:ty, $transform:expr, $leak:expr) => { ($src:expr, $expected:expr, $ty:ty, $transform:expr, $leak:expr, $ignore_problems:expr) => {
use bumpalo::Bump; use bumpalo::Bump;
use inkwell::context::Context; use inkwell::context::Context;
use roc_gen::run_jit_function; use roc_gen::run_jit_function;
@ -343,7 +344,7 @@ macro_rules! assert_llvm_evals_to {
let stdlib = arena.alloc(roc_builtins::std::standard_stdlib()); let stdlib = arena.alloc(roc_builtins::std::standard_stdlib());
let (main_fn_name, errors, lib) = let (main_fn_name, errors, lib) =
$crate::helpers::eval::helper(&arena, $src, stdlib, $leak, &context); $crate::helpers::eval::helper(&arena, $src, stdlib, $leak, $ignore_problems, &context);
let transform = |success| { let transform = |success| {
let expected = $expected; let expected = $expected;
@ -354,7 +355,7 @@ macro_rules! assert_llvm_evals_to {
}; };
($src:expr, $expected:expr, $ty:ty, $transform:expr) => { ($src:expr, $expected:expr, $ty:ty, $transform:expr) => {
assert_llvm_evals_to!($src, $expected, $ty, $transform, true); assert_llvm_evals_to!($src, $expected, $ty, $transform, true, false);
}; };
} }
@ -375,7 +376,7 @@ macro_rules! assert_evals_to {
// parsing the source, so that there's no chance their passing // parsing the source, so that there's no chance their passing
// or failing depends on leftover state from the previous one. // or failing depends on leftover state from the previous one.
{ {
assert_llvm_evals_to!($src, $expected, $ty, $transform, $leak); assert_llvm_evals_to!($src, $expected, $ty, $transform, $leak, false);
} }
{ {
// NOTE at the moment, the optimized tests do the same thing // NOTE at the moment, the optimized tests do the same thing
@ -392,7 +393,7 @@ macro_rules! assert_non_opt_evals_to {
($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. // Same as above, except with an additional transformation argument.
{ {
assert_llvm_evals_to!($src, $expected, $ty, $transform, true); assert_llvm_evals_to!($src, $expected, $ty, $transform, true, false);
} }
}; };
($src:expr, $expected:expr, $ty:ty, $transform:expr, $leak:expr) => {{ ($src:expr, $expected:expr, $ty:ty, $transform:expr, $leak:expr) => {{