Merge pull request #175 from mull-project/code-climate

stanislaw · web-flow · commit 09d8fb692e04 · 2021-12-05T09:47:55.000+01:00
Code climate: fix a batch of "; RUN:" lines in the tests
diff --git a/tests/integration/tests/check_commands/CHECK-EMPTY/02-error_CHECK_EMPTY_negative_match/filecheck.check b/tests/integration/tests/check_commands/CHECK-EMPTY/02-error_CHECK_EMPTY_negative_match/filecheck.check
@@ -1,2 +1,2 @@
-; CHECK: string1
-; CHECK-EMPTY:
+CHECK: string1
+CHECK-EMPTY:
diff --git a/tests/integration/tests/check_commands/CHECK-EMPTY/02-error_CHECK_EMPTY_negative_match/sample.itest b/tests/integration/tests/check_commands/CHECK-EMPTY/02-error_CHECK_EMPTY_negative_match/sample.itest
@@ -1,9 +1,9 @@
-; RUN: %cat "%S/filecheck.input" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" | %FILECHECK_TESTER_EXEC "%s" --match-full-lines
+RUN: %cat "%S/filecheck.input" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" | %FILECHECK_TESTER_EXEC "%s" --match-full-lines
 
-; CHECK: {{.*}}filecheck.check:2:15: error: CHECK-EMPTY: expected string not found in input{{$}}
-; CHECK: {{^}}; CHECK-EMPTY:{{$}}
-; CHECK: {{^}}              ^
-; CHECK: {{^}}<stdin>:2:1: note: scanning from here{{$}}
-; CHECK: string2
-; CHECK: {{^}}^{{$}}
-; CHECK-EMPTY:
+CHECK: {{.*}}filecheck.check:2:13: error: CHECK-EMPTY: expected string not found in input{{$}}
+CHECK: {{^}}CHECK-EMPTY:{{$}}
+CHECK: {{^}}            ^
+CHECK: {{^}}<stdin>:2:1: note: scanning from here{{$}}
+CHECK: string2
+CHECK: {{^}}^{{$}}
+CHECK-EMPTY:
diff --git a/tests/integration/tests/check_commands/CHECK-EMPTY/03-error_valid_but_followed_by_another_failing_check/filecheck.check b/tests/integration/tests/check_commands/CHECK-EMPTY/03-error_valid_but_followed_by_another_failing_check/filecheck.check
@@ -1,3 +1,3 @@
-; CHECK: string1
-; CHECK-EMPTY:
-; CHECK: string2
+CHECK: string1
+CHECK-EMPTY:
+CHECK: string2
diff --git a/tests/integration/tests/check_commands/CHECK-EMPTY/03-error_valid_but_followed_by_another_failing_check/sample.itest b/tests/integration/tests/check_commands/CHECK-EMPTY/03-error_valid_but_followed_by_another_failing_check/sample.itest
@@ -1,9 +1,9 @@
-; RUN: %cat "%S/filecheck.input" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines
+RUN: %cat "%S/filecheck.input" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines
 
-; CHECK:{{.*}}filecheck.check:3:10: error: CHECK: expected string not found in input{{$}}
-; CHECK:; CHECK: string2
-; CHECK:         ^
-; CHECK:<stdin>:2:1: note: scanning from here
-; CHECK-EMPTY:
-; CHECK:^
-; CHECK-EMPTY:
+CHECK:{{.*}}filecheck.check:3:8: error: CHECK: expected string not found in input{{$}}
+CHECK:CHECK: string2
+CHECK:       ^
+CHECK:<stdin>:2:1: note: scanning from here
+CHECK-EMPTY:
+CHECK:^
+CHECK-EMPTY:
diff --git a/tests/integration/tests/check_commands/CHECK-EMPTY/04-error_valid_but_followed_by_another_2_check_empty/filecheck.check b/tests/integration/tests/check_commands/CHECK-EMPTY/04-error_valid_but_followed_by_another_2_check_empty/filecheck.check
@@ -1,3 +1,3 @@
-; CHECK: string1
-; CHECK-EMPTY:
-; CHECK-EMPTY:
+CHECK: string1
+CHECK-EMPTY:
+CHECK-EMPTY:
diff --git a/tests/integration/tests/check_commands/CHECK-EMPTY/04-error_valid_but_followed_by_another_2_check_empty/sample.itest b/tests/integration/tests/check_commands/CHECK-EMPTY/04-error_valid_but_followed_by_another_2_check_empty/sample.itest
@@ -1,9 +1,9 @@
-; RUN: %cat "%S/filecheck.input" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines
+RUN: %cat "%S/filecheck.input" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines
 
-; CHECK:{{.*}}filecheck.check:3:15: error: CHECK-EMPTY: expected string not found in input{{$}}
-; CHECK:; CHECK-EMPTY:
-; CHECK:              ^
-; CHECK:<stdin>:2:1: note: scanning from here
-; CHECK-EMPTY:
-; CHECK:^
-; CHECK-EMPTY:
+CHECK:{{.*}}filecheck.check:3:13: error: CHECK-EMPTY: expected string not found in input{{$}}
+CHECK:CHECK-EMPTY:
+CHECK:            ^
+CHECK:<stdin>:2:1: note: scanning from here
+CHECK-EMPTY:
+CHECK:^
+CHECK-EMPTY:
diff --git a/tests/integration/tests/check_commands/CHECK-EMPTY/05-success_CHECK_EMPTY_after_CHECK/filecheck.check b/tests/integration/tests/check_commands/CHECK-EMPTY/05-success_CHECK_EMPTY_after_CHECK/filecheck.check
@@ -1,2 +1,2 @@
-; CHECK: hello
-; CHECK-EMPTY:
+CHECK: hello
+CHECK-EMPTY:
diff --git a/tests/integration/tests/check_commands/CHECK-EMPTY/05-success_CHECK_EMPTY_after_CHECK/sample.itest b/tests/integration/tests/check_commands/CHECK-EMPTY/05-success_CHECK_EMPTY_after_CHECK/sample.itest
@@ -1 +1 @@
-; RUN: %cat "%S/filecheck.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check"
+RUN: %cat "%S/filecheck.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check"
diff --git a/tests/integration/tests/check_commands/CHECK-EMPTY/06-success_CHECK_EMPTY_after_CHECK_two_times/sample.itest b/tests/integration/tests/check_commands/CHECK-EMPTY/06-success_CHECK_EMPTY_after_CHECK_two_times/sample.itest
@@ -1 +1 @@
-; RUN: %cat "%S/filecheck.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check"
+RUN: %cat "%S/filecheck.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check"
diff --git a/tests/integration/tests/check_commands/CHECK-NOT/multiple_strings/03-CHECK-NOT-has-no-effect-if-next-CHECK-passed/sample.itest b/tests/integration/tests/check_commands/CHECK-NOT/multiple_strings/03-CHECK-NOT-has-no-effect-if-next-CHECK-passed/sample.itest
@@ -1 +1 @@
-; RUN: %cat "%S/filecheck.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check"
+RUN: %cat "%S/filecheck.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check"
diff --git a/tests/integration/tests/check_commands/CHECK-NOT/one_string/positive/03-positive_match_regex/sample.itest b/tests/integration/tests/check_commands/CHECK-NOT/one_string/positive/03-positive_match_regex/sample.itest
@@ -1 +1 @@
-; RUN: %cat "%S/filecheck.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check"
+RUN: %cat "%S/filecheck.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check"
diff --git a/tests/integration/tests/check_commands/CHECK/one_string/positive-match/01-positive_match/sample.itest b/tests/integration/tests/check_commands/CHECK/one_string/positive-match/01-positive_match/sample.itest
@@ -1 +1 @@
-; RUN: %cat "%S/filecheck.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check"
+RUN: %cat "%S/filecheck.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check"
diff --git a/tests/integration/tests/check_commands/CHECK/one_string/positive-match/02-positive_match_check_without_preceeding_semicolon/sample.itest b/tests/integration/tests/check_commands/CHECK/one_string/positive-match/02-positive_match_check_without_preceeding_semicolon/sample.itest
@@ -1 +1 @@
-; RUN: %printf "hello" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check"
+RUN: %printf "hello" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check"
diff --git a/tests/integration/tests/check_commands/CHECK/one_string/positive-match/02-positive_match_whitespaces/sample.itest b/tests/integration/tests/check_commands/CHECK/one_string/positive-match/02-positive_match_whitespaces/sample.itest
@@ -1 +1 @@
-; RUN: %cat "%S/filecheck.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check"
+RUN: %cat "%S/filecheck.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check"
diff --git a/tests/integration/tests/check_commands/CHECK/one_string/positive-match/03-positive_regex_match/sample.itest b/tests/integration/tests/check_commands/CHECK/one_string/positive-match/03-positive_regex_match/sample.itest
@@ -1 +1 @@
-; RUN: %cat "%S/filecheck.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check"
+RUN: %cat "%S/filecheck.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check"
diff --git a/tests/integration/tests/check_commands/CHECK/one_string/positive-match/04-escaping_non_regex_parts/sample.itest b/tests/integration/tests/check_commands/CHECK/one_string/positive-match/04-escaping_non_regex_parts/sample.itest
@@ -1 +1 @@
-; RUN: %cat "%S/filecheck.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check"
+RUN: %cat "%S/filecheck.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check"
diff --git a/tests/integration/tests/check_commands/CHECK/one_string/positive-match/05-CHECK-two-times-matches-first/sample.itest b/tests/integration/tests/check_commands/CHECK/one_string/positive-match/05-CHECK-two-times-matches-first/sample.itest
@@ -1 +1 @@
-; RUN: %cat "%S/filecheck.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check"
+RUN: %cat "%S/filecheck.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check"
diff --git a/tests/integration/tests/check_commands/CHECK/three_strings/01-positive_match/sample.itest b/tests/integration/tests/check_commands/CHECK/three_strings/01-positive_match/sample.itest
@@ -1 +1 @@
-; RUN: %cat "%S/filecheck.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check"
+RUN: %cat "%S/filecheck.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check"
diff --git a/tests/integration/tests/check_commands/CHECK/three_strings/02-positive_match-one-line-between/sample.itest b/tests/integration/tests/check_commands/CHECK/three_strings/02-positive_match-one-line-between/sample.itest
@@ -1 +1 @@
-; RUN: %cat "%S/filecheck.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check"
+RUN: %cat "%S/filecheck.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check"
diff --git a/tests/integration/tests/check_commands/CHECK/two_strings/01-positive_match/sample.itest b/tests/integration/tests/check_commands/CHECK/two_strings/01-positive_match/sample.itest
@@ -1 +1 @@
-; RUN: %cat "%S/filecheck.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check"
+RUN: %cat "%S/filecheck.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check"
diff --git a/tests/integration/tests/check_commands/CHECK/two_strings/02-positive_match-one-line-between/sample.itest b/tests/integration/tests/check_commands/CHECK/two_strings/02-positive_match-one-line-between/sample.itest
@@ -1 +1 @@
-; RUN: %cat "%S/filecheck.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check"
+RUN: %cat "%S/filecheck.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check"
diff --git a/tests/integration/tests/examples/options/--match-full-lines/without--match-full-lines.itest b/tests/integration/tests/examples/options/--match-full-lines/without--match-full-lines.itest
@@ -1 +1 @@
-; RUN: printf "String1\nString2\nString3" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/without--match-full-lines.check"
+RUN: printf "String1\nString2\nString3" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/without--match-full-lines.check"
diff --git a/tests/integration/tests/examples/options/--strict-whitespace/without--strict-whitespace.itest b/tests/integration/tests/examples/options/--strict-whitespace/without--strict-whitespace.itest
@@ -1,3 +1,3 @@
-; RUN: printf "String1 String2 String3" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/without--strict-whitespace.check"
-; RUN: printf "String1  String2          String3" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/without--strict-whitespace.check"
-; RUN: printf "   String1\tString2\t\t\tString3 " | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/without--strict-whitespace.check"
+RUN: printf "String1 String2 String3" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/without--strict-whitespace.check"
+RUN: printf "String1  String2          String3" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/without--strict-whitespace.check"
+RUN: printf "   String1\tString2\t\t\tString3 " | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/without--strict-whitespace.check"
diff --git a/tests/integration/tests/examples/options/strict-mode/strict-mode.itest b/tests/integration/tests/examples/options/strict-mode/strict-mode.itest
@@ -1 +1 @@
-; RUN: printf "String1\nString2\nString3" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/strict-mode.check" --strict-whitespace --match-full-lines
+RUN: printf "String1\nString2\nString3" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/strict-mode.check" --strict-whitespace --match-full-lines
diff --git a/tests/integration/tests/invalid_input/05_one_newline_symbol_input/sample.itest b/tests/integration/tests/invalid_input/05_one_newline_symbol_input/sample.itest
@@ -1 +1 @@
-; RUN: %printf "\n" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check"
+RUN: %printf "\n" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check"
diff --git a/tests/integration/tests/options/--implicit-check-not/07_is_case_insensitive_match/sample.itest b/tests/integration/tests/options/--implicit-check-not/07_is_case_insensitive_match/sample.itest
@@ -1,2 +1,2 @@
-; RUN: %printf "Error\nHello" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check" --implicit-check-not "error"
-; RUN: %printf "ERROR\nHello" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check" --implicit-check-not "error"
+RUN: %printf "Error\nHello" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check" --implicit-check-not "error"
+RUN: %printf "ERROR\nHello" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check" --implicit-check-not "error"
diff --git a/tests/integration/tests/options/--match-full-lines/CHECK/02_when_strict_whitespace_is_also_specified/01_when_no_strict_whitespace_then_leading_whitespace_is_ignored/sample.itest b/tests/integration/tests/options/--match-full-lines/CHECK/02_when_strict_whitespace_is_also_specified/01_when_no_strict_whitespace_then_leading_whitespace_is_ignored/sample.itest
@@ -1 +1 @@
-; RUN: %cat "%S/filecheck.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check" --match-full-lines
+RUN: %cat "%S/filecheck.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check" --match-full-lines
diff --git a/tests/integration/tests/options/--match-full-lines/CHECK/02_when_strict_whitespace_is_also_specified/02_when_strict_whitespace_then_leading_whitespace_is_not_ignored/01_string/sample.itest b/tests/integration/tests/options/--match-full-lines/CHECK/02_when_strict_whitespace_is_also_specified/02_when_strict_whitespace_then_leading_whitespace_is_not_ignored/01_string/sample.itest
@@ -1 +1 @@
-; RUN: %cat "%S/filecheck.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check" --match-full-lines --strict-whitespace
+RUN: %cat "%S/filecheck.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check" --match-full-lines --strict-whitespace
diff --git a/tests/integration/tests/options/--match-full-lines/CHECK/02_when_strict_whitespace_is_also_specified/02_when_strict_whitespace_then_leading_whitespace_is_not_ignored/02_regex/sample.itest b/tests/integration/tests/options/--match-full-lines/CHECK/02_when_strict_whitespace_is_also_specified/02_when_strict_whitespace_then_leading_whitespace_is_not_ignored/02_regex/sample.itest
@@ -1 +1 @@
-; RUN: %cat "%S/filecheck.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check" --match-full-lines --strict-whitespace
+RUN: %cat "%S/filecheck.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check" --match-full-lines --strict-whitespace
diff --git a/tests/integration/tests/real_world_samples/FileCheck-manual/CHECK-EMPTY/sample.itest b/tests/integration/tests/real_world_samples/FileCheck-manual/CHECK-EMPTY/sample.itest
@@ -1 +1 @@
-; RUN: %cat "%S/filecheck.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check"
+RUN: %cat "%S/filecheck.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check"
diff --git a/tests/integration/tests/real_world_samples/mull/01-mull-scalar-operator-enum/sample.itest b/tests/integration/tests/real_world_samples/mull/01-mull-scalar-operator-enum/sample.itest
@@ -1 +1 @@
-; RUN: %cat "%S/filecheck.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check"
+RUN: %cat "%S/filecheck.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check"

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-; RUN: %cat "%S/filecheck.input" \| %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check"`
	`1`	`+RUN: %cat "%S/filecheck.input" \| %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check"`