Merge pull request #2211 from Skgland/file-based-cli-tests

fix missing .pl file for singleton test case and move .pl files under `<testcase>.in/`
mthom · Dec 6, 2023 · 2e75067 · 2e75067
2 parents 43556f6 + 147e47c
commit 2e75067
Show file tree

Hide file tree

Showing 13 changed files with 15 additions and 8 deletions.
diff --git a/...ssues/do_not_duplicate_path_components.pl → ...t_duplicate_path_components.in/throw_e.pl b/...ssues/do_not_duplicate_path_components.pl → ...t_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
@@ -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 → ...li/issues/goals_compound_goal.in/goals.pl b/tests/scryer/cli/issues/goals.pl → ...li/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
@@ -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
@@ -0,0 +1,3 @@
+test :- write(world), nl.
+
+:- initialization(write(hello)).
diff --git 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 → ...urs_check_flag.in/occurs_check_example.pl b/tests/scryer/cli/issues/occurs_check_flag.pl → ...urs_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
@@ -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 → tests/scryer/cli/issues/op3.in/op3.pl b/tests/scryer/cli/issues/op3.pl → tests/scryer/cli/issues/op3.in/op3.pl
diff --git 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
@@ -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
@@ -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
@@ -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.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		test :- write(world), nl.

		:- initialization(write(hello)).