From 147e47c8eb8f46fc35c1b9e9504dc5a2944e65a0 Mon Sep 17 00:00:00 2001 From: Skgland Date: Wed, 6 Dec 2023 21:21:04 +0100 Subject: [PATCH] fix missing .pl file for singleton test case and move .pl files under `.in/` follow up to #2205 --- .../throw_e.pl} | 0 .../scryer/cli/issues/do_not_duplicate_path_components.stdin | 4 ++-- tests/scryer/cli/issues/{ => goals_compound_goal.in}/goals.pl | 0 tests/scryer/cli/issues/goals_compound_goal.toml | 2 +- tests/scryer/cli/issues/goals_multiple_goals.in/goals.pl | 3 +++ tests/scryer/cli/issues/goals_multiple_goals.toml | 2 +- .../occurs_check_example.pl} | 0 tests/scryer/cli/issues/occurs_check_flag.toml | 2 +- tests/scryer/cli/issues/{ => op3.in}/op3.pl | 0 tests/scryer/cli/issues/op3.toml | 2 +- .../cli/issues/singleton_warning.in/singleton_example.pl | 4 ++++ tests/scryer/cli/issues/singleton_warning.stdin | 2 +- tests/scryer/cli/issues/singleton_warning.stdout | 2 +- 13 files changed, 15 insertions(+), 8 deletions(-) rename tests/scryer/cli/issues/{do_not_duplicate_path_components.pl => do_not_duplicate_path_components.in/throw_e.pl} (100%) rename tests/scryer/cli/issues/{ => goals_compound_goal.in}/goals.pl (100%) create mode 100644 tests/scryer/cli/issues/goals_multiple_goals.in/goals.pl rename tests/scryer/cli/issues/{occurs_check_flag.pl => occurs_check_flag.in/occurs_check_example.pl} (100%) rename tests/scryer/cli/issues/{ => op3.in}/op3.pl (100%) create mode 100644 tests/scryer/cli/issues/singleton_warning.in/singleton_example.pl 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 4d8f3b9c5..cf9a3782b 100644 --- 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 930d529b4..4fd7d5ba9 100644 --- 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 index 000000000..fc94b92ee --- /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 3dd6db137..25e739dd0 100644 --- 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 34e8ee67b..b5013924c 100644 --- 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 820aabe9d..864081c2c 100644 --- 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 index 000000000..f8207fa70 --- /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 f82cad20a..9e58bda53 100644 --- 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 be7e6c3d3..2f5e213df 100644 --- 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.