fix missing .pl file for singleton test case and move .pl files under `<testcase...

follow up to #2205

diff --git a/tests/scryer/cli/issues/do_not_duplicate_path_components.pl b/tests/scryer/cli/issues/do_not_duplicate_path_components.in/throw_e.pl
similarity index 100%
rename from tests/scryer/cli/issues/do_not_duplicate_path_components.pl
rename to tests/scryer/cli/issues/do_not_duplicate_path_components.in/throw_e.pl

diff --git a/tests/scryer/cli/issues/do_not_duplicate_path_components.stdin b/tests/scryer/cli/issues/do_not_duplicate_path_components.stdin
index 4d8f3b9c5938372d9608f7c59cdbf8eee0fe8c6e..cf9a3782bab1f09c6e04afe3bf746784f8df4e17 100644 (file)
--- a/tests/scryer/cli/issues/do_not_duplicate_path_components.stdin
+++ b/tests/scryer/cli/issues/do_not_duplicate_path_components.stdin
@@ -1,3 +1,3 @@
-['tests/scryer/cli/issues/do_not_duplicate_path_components.pl'].
-['tests/scryer/cli/issues/do_not_duplicate_path_components.pl'].
+['throw_e.pl'].
+['throw_e.pl'].
 halt.

diff --git a/tests/scryer/cli/issues/goals.pl b/tests/scryer/cli/issues/goals_compound_goal.in/goals.pl
similarity index 100%
rename from tests/scryer/cli/issues/goals.pl
rename to tests/scryer/cli/issues/goals_compound_goal.in/goals.pl

diff --git a/tests/scryer/cli/issues/goals_compound_goal.toml b/tests/scryer/cli/issues/goals_compound_goal.toml
index 930d529b41205db98c9a592e8a9e64d20b9cc72d..4fd7d5ba9dd9c6a5c24176e62a9cac912de13902 100644 (file)
--- a/tests/scryer/cli/issues/goals_compound_goal.toml
+++ b/tests/scryer/cli/issues/goals_compound_goal.toml
@@ -1,2 +1,2 @@
 # issue 820
-args = ["-f", "--no-add-history", "-g", "test,halt", "tests/scryer/cli/issues/goals.pl"]
+args = ["-f", "--no-add-history", "-g", "test,halt", "goals.pl"]

diff --git a/tests/scryer/cli/issues/goals_multiple_goals.in/goals.pl b/tests/scryer/cli/issues/goals_multiple_goals.in/goals.pl
new file mode 100644 (file)
index 0000000..fc94b92
--- /dev/null
+++ b/tests/scryer/cli/issues/goals_multiple_goals.in/goals.pl
@@ -0,0 +1,3 @@
+test :- write(world), nl.
+
+:- initialization(write(hello)).
\ No newline at end of file

diff --git a/tests/scryer/cli/issues/goals_multiple_goals.toml b/tests/scryer/cli/issues/goals_multiple_goals.toml
index 3dd6db137920ffd7c69bc052212f9295f92144e2..25e739dd0dfe08618d5126d120df0853c09c7973 100644 (file)
--- a/tests/scryer/cli/issues/goals_multiple_goals.toml
+++ b/tests/scryer/cli/issues/goals_multiple_goals.toml
@@ -1,2 +1,2 @@
 # issue 820
-args = ["-f", "--no-add-history", "-g", "test", "-g", "halt", "tests/scryer/cli/issues/goals.pl"]
+args = ["-f", "--no-add-history", "-g", "test", "-g", "halt", "goals.pl"]

diff --git a/tests/scryer/cli/issues/occurs_check_flag.pl b/tests/scryer/cli/issues/occurs_check_flag.in/occurs_check_example.pl
similarity index 100%
rename from tests/scryer/cli/issues/occurs_check_flag.pl
rename to tests/scryer/cli/issues/occurs_check_flag.in/occurs_check_example.pl

diff --git a/tests/scryer/cli/issues/occurs_check_flag.toml b/tests/scryer/cli/issues/occurs_check_flag.toml
index 34e8ee67b3f33d95c4f2c0f5fd77788db5d0ab3b..b5013924cb74df4e36420c7d0b762a55fefdbb19 100644 (file)
--- a/tests/scryer/cli/issues/occurs_check_flag.toml
+++ b/tests/scryer/cli/issues/occurs_check_flag.toml
@@ -1,2 +1,2 @@
 # issue 841
-args = ["-f", "--no-add-history", "tests/scryer/cli/issues/occurs_check_flag.pl"]
+args = ["-f", "--no-add-history", "occurs_check_example.pl"]

diff --git a/tests/scryer/cli/issues/op3.pl b/tests/scryer/cli/issues/op3.in/op3.pl
similarity index 100%
rename from tests/scryer/cli/issues/op3.pl
rename to tests/scryer/cli/issues/op3.in/op3.pl

diff --git a/tests/scryer/cli/issues/op3.toml b/tests/scryer/cli/issues/op3.toml
index 820aabe9d079ccfbac02d5fd4e4c96070c0239d2..864081c2cdecb1383e6fca31379ab5c45cb26344 100644 (file)
--- a/tests/scryer/cli/issues/op3.toml
+++ b/tests/scryer/cli/issues/op3.toml
@@ -1,2 +1,2 @@
 # issue 839
-args = ["-f", "--no-add-history", "tests/scryer/cli/issues/op3.pl", "-g", "halt"]
+args = ["-f", "--no-add-history", "op3.pl", "-g", "halt"]

diff --git a/tests/scryer/cli/issues/singleton_warning.in/singleton_example.pl b/tests/scryer/cli/issues/singleton_warning.in/singleton_example.pl
new file mode 100644 (file)
index 0000000..f8207fa
--- /dev/null
+++ b/tests/scryer/cli/issues/singleton_warning.in/singleton_example.pl
@@ -0,0 +1,4 @@
+% hello
+% line!
+
+a :- b(X).

diff --git a/tests/scryer/cli/issues/singleton_warning.stdin b/tests/scryer/cli/issues/singleton_warning.stdin
index f82cad20af0d7adb4d153ee6fe9730d740a7b8d7..9e58bda53154d834f8746bef292c3bb67687a71b 100644 (file)
--- a/tests/scryer/cli/issues/singleton_warning.stdin
+++ b/tests/scryer/cli/issues/singleton_warning.stdin
@@ -1,2 +1,2 @@
-['tests/scryer/cli/issues/issue812-singleton-warning.pl'].
+['singleton_example.pl'].
 halt.

diff --git a/tests/scryer/cli/issues/singleton_warning.stdout b/tests/scryer/cli/issues/singleton_warning.stdout
index be7e6c3d355b6b4cfd0b76d89cad151f5a18527e..2f5e213df1ac857a4e752e0d7568bdaf6dd6d67a 100644 (file)
--- a/tests/scryer/cli/issues/singleton_warning.stdout
+++ b/tests/scryer/cli/issues/singleton_warning.stdout
@@ -1,2 +1,2 @@
-Warning: singleton variables X at line 4 of issue812-singleton-warning.pl
+Warning: singleton variables X at line 4 of singleton_example.pl
    true.