>,
- O: assert_cmd::assert::IntoOutputPredicate,
- P: predicates_core::Predicate<[u8]>,
->(
- stdin: S,
- expected_stdout: O,
-) {
- run_top_level_test_with_args::<&[&str], _, _, _, _>(&[], stdin, expected_stdout)
-}
-
-/// Test whether scryer-prolog
-/// produces the expected output when called with the supplied
-/// arguments and fed the supplied input
-pub fn run_top_level_test_with_args<
- A: IntoIterator- ,
- S: Into>,
- O: assert_cmd::assert::IntoOutputPredicate
,
- AS: AsRef,
- P: predicates_core::Predicate<[u8]>,
->(
- args: A,
- stdin: S,
- expected_stdout: O,
-) {
- Command::cargo_bin(SCRYER_PROLOG)
- .unwrap()
- .arg("-f")
- .arg("--no-add-history")
- .args(args)
- .write_stdin(stdin)
- .assert()
- .stdout(expected_stdout.into_output())
- .success();
-}
diff --git a/tests/scryer/issues.rs b/tests/scryer/issues.rs
index f7a71007..39e30378 100644
--- a/tests/scryer/issues.rs
+++ b/tests/scryer/issues.rs
@@ -1,169 +1,10 @@
-use crate::helper::{load_module_test, run_top_level_test_no_args, run_top_level_test_with_args};
+use crate::helper::load_module_test;
use serial_test::serial;
-// issue #857
-#[test]
-fn display_constraints() {
- run_top_level_test_no_args(
- "\
- X = 1.\n\
- use_module(library(dif)).\n\
- X = 1.\n\
- dif(X,1).\n
- halt.\n",
- " \
- X = 1.\n \
- true.\n \
- X = 1.\n \
- dif:dif(X,1).\n\
- ",
- );
-}
-
-// issue #852
-#[test]
-fn do_not_duplicate_path_components() {
- run_top_level_test_no_args(
- "\
- ['tests-pl/issue852-throw_e.pl'].\n\
- ['tests-pl/issue852-throw_e.pl'].\n\
- halt.\n\
- ",
- " throw(e).\n throw(e).\n",
- );
-}
-
-// issue #844
-#[test]
-fn handle_residual_goal() {
- run_top_level_test_no_args(
- "\
- use_module(library(dif)).\n\
- use_module(library(atts)).\n\
- -X\\=X.\n\
- -X=X.\n\
- dif(-X,X).\n\
- dif(-X,X), -X=X.\n\
- call_residue_vars(dif(-X,X), Vars).\n\
- set_prolog_flag(occurs_check, true).\n\
- -X\\=X.\n\
- dif(-X,X).\n\
- halt.\n\
- ",
- " \
- true.\n \
- true.\n \
- false.\n \
- X = -X.\n \
- dif:dif(-X,X).\n \
- false.\n \
- Vars = [X], dif:dif(-X,X).\n \
- true.\n \
- true.\n \
- true.\n\
- ",
- )
-}
-
-// issue #841
-#[test]
-fn occurs_check_flag() {
- run_top_level_test_with_args(
- ["tests-pl/issue841-occurs-check.pl"],
- "\
- f(X, X).\n\
- halt.\n\
- ",
- " false.\n",
- )
-}
-
-#[test]
-fn occurs_check_flag2() {
- run_top_level_test_no_args(
- "\
- set_prolog_flag(occurs_check, true).\n\
- X = -X.\n\
- asserta(f(X,g(X))).\n\
- f(X,X).\n\
- X-X = X-g(X).\n\
- halt.\n\
- ",
- " \
- true.\n \
- false.\n \
- true.\n \
- false.\n \
- false.\n\
- ",
- )
-}
-
-// issue #839
-#[test]
-fn op3() {
- run_top_level_test_with_args(["tests-pl/issue839-op3.pl", "-g", "halt"], "", "")
-}
-
-// issue #820
-#[test]
-fn multiple_goals() {
- run_top_level_test_with_args(
- ["-g", "test", "-g", "halt", "tests-pl/issue820-goals.pl"],
- "",
- "helloworld\n",
- );
-}
-
-// issue #820
-#[test]
-fn compound_goal() {
- run_top_level_test_with_args(
- ["-g", "test,halt", "tests-pl/issue820-goals.pl"],
- "",
- "helloworld\n",
- )
-}
-
-// issue #815
-#[test]
-fn no_stutter() {
- run_top_level_test_no_args(
- "write(a), write(b), false.\n\
- halt.\n\
- ",
- "ab false.\n",
- )
-}
-
-/*
-// issue #812
-#[test] // FIXME: the line number is of by one (should be 4), empty line not accounted for or starting to count at line 0?
-fn singleton_warning() {
- run_top_level_test_no_args(
- "['tests-pl/issue812-singleton-warning.pl'].\n\
- halt.\n",
- "\
- Warning: singleton variables X at line 3 of issue812-singleton-warning.pl\n \
- true.\n\
- ",
- );
-}
-*/
-
-// issue #807
-#[test]
-fn ignored_constraint() {
- run_top_level_test_no_args(
- "use_module(library(freeze)), freeze(X,false), X \\=a.\n\
- halt.",
- " freeze:freeze(X,false).\n",
- );
-}
-
// issue #831
#[serial]
#[test]
+#[cfg_attr(miri, ignore = "blocked on streams.rs UB")]
fn call_0() {
load_module_test(
"tests-pl/issue831-call0.pl",
diff --git a/tests/scryer/main.rs b/tests/scryer/main.rs
index 7865c0b3..d1e826f0 100644
--- a/tests/scryer/main.rs
+++ b/tests/scryer/main.rs
@@ -1,3 +1,23 @@
mod helper;
mod issues;
mod src_tests;
+
+/// To add new cli test copy an existing .toml file in `tests/scryer/cli/issues/` or `tests/scryer/cli/issues/src_tests/`,
+/// adjust as necessary the `-f` and `--no-add-history` args should be kept but additional args may be added.
+/// For input on stdin add a .stdin file with the same filename.
+/// Then to generate new reference output files into dump/ run `TRYCMD=dump cargo test -- cli_test`
+/// check that the output in the .stdout and .stderr file is as expected, then move them next to the .toml file.
+///
+/// If a test does not have a .stderr or .stdout the corresponding output is ignored i.e. any and no output is accepted
+///
+/// to re-generate all reference output files run `TRYCMD=overwrite cargo test -- cli_test`
+/// then check that the changes are as expected e.g. by looking at the `git diff`
+#[test]
+#[cfg_attr(miri, ignore = "blocked on crossbeam UB")]
+fn cli_tests() {
+ trycmd::TestCases::new()
+ .default_bin_name("scryer-prolog")
+ .case("tests/scryer/cli/issues/*.toml")
+ .skip("tests/scryer/cli/issues/singleton_warning.toml") // wrong line number
+ .case("tests/scryer/cli/src_tests/*.toml");
+}
diff --git a/tests/scryer/src_tests.rs b/tests/scryer/src_tests.rs
index ba68e5dd..a3d6ddbf 100644
--- a/tests/scryer/src_tests.rs
+++ b/tests/scryer/src_tests.rs
@@ -1,32 +1,37 @@
-use crate::helper::{load_module_test, run_top_level_test_with_args};
+use crate::helper::load_module_test;
use serial_test::serial;
#[serial]
#[test]
+#[cfg_attr(miri, ignore = "blocked on streams.rs UB")]
fn builtins() {
load_module_test("src/tests/builtins.pl", "");
}
#[serial]
#[test]
+#[cfg_attr(miri, ignore = "blocked on streams.rs UB")]
fn call_with_inference_limit() {
load_module_test("src/tests/call_with_inference_limit.pl", "");
}
#[serial]
#[test]
+#[cfg_attr(miri, ignore = "blocked on streams.rs UB")]
fn facts() {
load_module_test("src/tests/facts.pl", "");
}
#[serial]
#[test]
+#[cfg_attr(miri, ignore = "blocked on streams.rs UB")]
fn hello_world() {
load_module_test("src/tests/hello_world.pl", "Hello World!\n");
}
#[serial]
#[test]
+#[cfg_attr(miri, ignore = "blocked on streams.rs UB")]
fn syntax_error() {
load_module_test(
"tests-pl/syntax_error.pl",
@@ -36,18 +41,21 @@ fn syntax_error() {
#[serial]
#[test]
+#[cfg_attr(miri, ignore = "blocked on streams.rs UB")]
fn predicates() {
load_module_test("src/tests/predicates.pl", "");
}
#[serial]
#[test]
+#[cfg_attr(miri, ignore = "blocked on streams.rs UB")]
fn rules() {
load_module_test("src/tests/rules.pl", "");
}
#[serial]
#[test]
+#[cfg_attr(miri, ignore = "blocked on streams.rs UB")]
fn setup_call_cleanup_load() {
load_module_test(
"src/tests/setup_call_cleanup.pl",
@@ -55,59 +63,16 @@ fn setup_call_cleanup_load() {
);
}
-#[test]
-fn setup_call_cleanup_process() {
- run_top_level_test_with_args(
- ["src/tests/setup_call_cleanup.pl", "-f", "-g", "halt"],
- "",
- "1+21+31+2>A+B1+G1+2>41+2>B1+2>31+2>31+2>4ba",
- );
-}
-
#[serial]
#[test]
+#[cfg_attr(miri, ignore = "blocked on streams.rs UB")]
fn clpz_load() {
load_module_test("src/tests/clpz/test_clpz.pl", "");
}
#[serial]
#[test]
+#[cfg_attr(miri, ignore = "blocked on streams.rs UB")]
fn iso_conformity_tests() {
load_module_test("tests-pl/iso-conformity-tests.pl", "All tests passed");
}
-
-#[test]
-fn dif_tests() {
- run_top_level_test_with_args(
- ["src/tests/dif.pl", "-f", "-g", "main_quiet"],
- "",
- "All tests passed",
- );
-}
-
-#[test]
-fn ground_tests() {
- run_top_level_test_with_args(
- ["src/tests/ground.pl", "-f", "-g", "main_quiet"],
- "",
- "All tests passed",
- );
-}
-
-#[test]
-fn term_variables_tests() {
- run_top_level_test_with_args(
- ["src/tests/term_variables.pl", "-f", "-g", "main_quiet"],
- "",
- "All tests passed",
- );
-}
-
-#[test]
-fn acyclic_term_tests() {
- run_top_level_test_with_args(
- ["src/tests/acyclic_term.pl", "-f", "-g", "main_quiet"],
- "",
- "All tests passed",
- );
-}