From b32498b37cb018c11f10396cd8c5de70bfad1fd2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bennet=20Ble=C3=9Fmann?= Date: Sat, 6 Jul 2024 18:24:16 +0200 Subject: [PATCH] adjust ignore reason --- src/machine/lib_machine.rs | 22 +++++++++++----------- tests/scryer/issues.rs | 4 ++-- tests/scryer/main.rs | 5 ++++- tests/scryer/src_tests.rs | 20 ++++++++++---------- 4 files changed, 27 insertions(+), 24 deletions(-) diff --git a/src/machine/lib_machine.rs b/src/machine/lib_machine.rs index 57bb45a9..8480950b 100644 --- a/src/machine/lib_machine.rs +++ b/src/machine/lib_machine.rs @@ -278,7 +278,7 @@ mod tests { } #[test] - #[cfg_attr(miri, ignore = "blocked on libraries.rs UB")] + #[cfg_attr(miri, ignore = "it takes too long to run")] fn failing_query() { let mut machine = Machine::new_lib(); let query = String::from(r#"triple("a",P,"b")."#); @@ -292,7 +292,7 @@ mod tests { } #[test] - #[cfg_attr(miri, ignore = "blocked on libraries.rs UB")] + #[cfg_attr(miri, ignore = "it takes too long to run")] fn complex_results() { let mut machine = Machine::new_lib(); machine.load_module_string( @@ -349,7 +349,7 @@ mod tests { } #[test] - #[cfg_attr(miri, ignore = "blocked on libraries.rs UB")] + #[cfg_attr(miri, ignore = "it takes too long to run")] fn empty_predicate() { let mut machine = Machine::new_lib(); machine.load_module_string( @@ -365,7 +365,7 @@ mod tests { } #[test] - #[cfg_attr(miri, ignore = "blocked on libraries.rs UB")] + #[cfg_attr(miri, ignore = "it takes too long to run")] fn list_results() { let mut machine = Machine::new_lib(); machine.load_module_string( @@ -394,7 +394,7 @@ mod tests { } #[test] - #[cfg_attr(miri, ignore = "blocked on libraries.rs UB")] + #[cfg_attr(miri, ignore = "it takes too long to run")] fn consult() { let mut machine = Machine::new_lib(); @@ -453,7 +453,7 @@ mod tests { } #[test] - #[cfg_attr(miri, ignore = "blocked on libraries.rs UB")] + #[cfg_attr(miri, ignore = "it takes too long to run")] fn integration_test() { let mut machine = Machine::new_lib(); @@ -496,7 +496,7 @@ mod tests { } #[test] - #[cfg_attr(miri, ignore = "blocked on libraries.rs UB")] + #[cfg_attr(miri, ignore = "it takes too long to run")] fn findall() { let mut machine = Machine::new_lib(); @@ -529,7 +529,7 @@ mod tests { } #[test] - #[cfg_attr(miri, ignore = "blocked on libraries.rs UB")] + #[cfg_attr(miri, ignore = "it takes too long to run")] fn dont_return_partial_matches() { let mut machine = Machine::new_lib(); @@ -553,7 +553,7 @@ mod tests { } #[test] - #[cfg_attr(miri, ignore = "blocked on libraries.rs UB")] + #[cfg_attr(miri, ignore = "it takes too long to run")] fn dont_return_partial_matches_without_discountiguous() { let mut machine = Machine::new_lib(); @@ -585,7 +585,7 @@ mod tests { } #[test] - #[cfg_attr(miri, ignore = "blocked on libraries.rs UB")] + #[cfg_attr(miri, ignore = "it takes too long to run")] fn non_existent_predicate_should_not_cause_panic_when_other_predicates_are_defined() { let mut machine = Machine::new_lib(); @@ -610,7 +610,7 @@ mod tests { } #[test] - #[cfg_attr(miri, ignore = "blocked on libraries.rs UB")] + #[cfg_attr(miri, ignore = "it takes too long to run")] fn issue_2341() { let mut machine = Machine::new_lib(); diff --git a/tests/scryer/issues.rs b/tests/scryer/issues.rs index c21a8381..5e21577e 100644 --- a/tests/scryer/issues.rs +++ b/tests/scryer/issues.rs @@ -4,7 +4,7 @@ use serial_test::serial; // issue #831 #[serial] #[test] -#[cfg_attr(miri, ignore = "blocked on helper.rs UB")] +#[cfg_attr(miri, ignore = "it takes too long to run")] fn call_0() { load_module_test( "tests-pl/issue831-call0.pl", @@ -15,7 +15,7 @@ fn call_0() { // issue #2361 #[serial] #[test] -#[cfg_attr(miri, ignore = "blocked on helper.rs UB")] +#[cfg_attr(miri, ignore = "it takes too long to run")] fn call_qualification() { load_module_test("tests-pl/issue2361-call-qualified.pl", ""); } diff --git a/tests/scryer/main.rs b/tests/scryer/main.rs index 878f0d90..85f7df98 100644 --- a/tests/scryer/main.rs +++ b/tests/scryer/main.rs @@ -14,7 +14,10 @@ mod src_tests; /// then check that the changes are as expected e.g. by looking at the `git diff` #[test] #[cfg(not(all(target_arch = "wasm32", target_os = "unknown")))] -#[cfg_attr(miri, ignore = "blocked on crossbeam UB")] +#[cfg_attr( + miri, + ignore = "miri isolation, unsupported operation: can't call foreign function" +)] fn cli_tests() { trycmd::TestCases::new() .default_bin_name("scryer-prolog") diff --git a/tests/scryer/src_tests.rs b/tests/scryer/src_tests.rs index 2434cb1f..f0edd5d8 100644 --- a/tests/scryer/src_tests.rs +++ b/tests/scryer/src_tests.rs @@ -3,35 +3,35 @@ use serial_test::serial; #[serial] #[test] -#[cfg_attr(miri, ignore = "blocked on helper.rs UB")] +#[cfg_attr(miri, ignore = "it takes too long to run")] fn builtins() { load_module_test("src/tests/builtins.pl", ""); } #[serial] #[test] -#[cfg_attr(miri, ignore = "blocked on helper.rs UB")] +#[cfg_attr(miri, ignore = "it takes too long to run")] fn call_with_inference_limit() { load_module_test("src/tests/call_with_inference_limit.pl", ""); } #[serial] #[test] -#[cfg_attr(miri, ignore = "blocked on helper.rs UB")] +#[cfg_attr(miri, ignore = "it takes too long to run")] fn facts() { load_module_test("src/tests/facts.pl", ""); } #[serial] #[test] -#[cfg_attr(miri, ignore = "blocked on helper.rs UB")] +#[cfg_attr(miri, ignore = "it takes too long to run")] fn hello_world() { load_module_test("src/tests/hello_world.pl", "Hello World!\n"); } #[serial] #[test] -#[cfg_attr(miri, ignore = "blocked on helper.rs UB")] +#[cfg_attr(miri, ignore = "it takes too long to run")] fn syntax_error() { load_module_test( "tests-pl/syntax_error.pl", @@ -41,21 +41,21 @@ fn syntax_error() { #[serial] #[test] -#[cfg_attr(miri, ignore = "blocked on helper.rs UB")] +#[cfg_attr(miri, ignore = "it takes too long to run")] fn predicates() { load_module_test("src/tests/predicates.pl", ""); } #[serial] #[test] -#[cfg_attr(miri, ignore = "blocked on helper.rs UB")] +#[cfg_attr(miri, ignore = "it takes too long to run")] fn rules() { load_module_test("src/tests/rules.pl", ""); } #[serial] #[test] -#[cfg_attr(miri, ignore = "blocked on helper.rs UB")] +#[cfg_attr(miri, ignore = "it takes too long to run")] fn setup_call_cleanup_load() { load_module_test( "src/tests/setup_call_cleanup.pl", @@ -65,14 +65,14 @@ fn setup_call_cleanup_load() { #[serial] #[test] -#[cfg_attr(miri, ignore = "blocked on helper.rs UB")] +#[cfg_attr(miri, ignore = "it takes too long to run")] fn clpz_load() { load_module_test("src/tests/clpz/test_clpz.pl", ""); } #[serial] #[test] -#[cfg_attr(miri, ignore = "blocked on helper.rs UB")] +#[cfg_attr(miri, ignore = "it takes too long to run")] fn iso_conformity_tests() { load_module_test("tests-pl/iso-conformity-tests.pl", "All tests passed"); } -- 2.54.0