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

stanislaw · web-flow · commit 3511de418d94 · 2021-12-05T09:58:41.000+01:00
Code climate: fix next batch of "; " occurences
diff --git a/tests/integration/tests/check_commands/CHECK-EMPTY/06-success_CHECK_EMPTY_after_CHECK_two_times/filecheck.check b/tests/integration/tests/check_commands/CHECK-EMPTY/06-success_CHECK_EMPTY_after_CHECK_two_times/filecheck.check
@@ -1,4 +1,4 @@
-; CHECK: hello
-; CHECK-EMPTY:
-; CHECK: hello
-; CHECK-EMPTY:
+CHECK: hello
+CHECK-EMPTY:
+CHECK: hello
+CHECK-EMPTY:
diff --git a/tests/integration/tests/check_commands/CHECK-NEXT/01-negative_match_line_does_not_exist/filecheck.check b/tests/integration/tests/check_commands/CHECK-NEXT/01-negative_match_line_does_not_exist/filecheck.check
@@ -1,2 +1,2 @@
-; CHECK: string 1
-; CHECK-NEXT: foo
+CHECK: string 1
+CHECK-NEXT: foo
diff --git a/tests/integration/tests/check_commands/CHECK-NEXT/01-negative_match_line_does_not_exist/sample.itest b/tests/integration/tests/check_commands/CHECK-NEXT/01-negative_match_line_does_not_exist/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:2:15: error: CHECK-NEXT: expected string not found in input
-; CHECK:; CHECK-NEXT: foo
-; CHECK:              ^
-; CHECK:<stdin>:2:1: note: scanning from here
-; CHECK:string 2
-; CHECK:^
-; CHECK-EMPTY:
+CHECK:{{.*}}filecheck.check:2:13: error: CHECK-NEXT: expected string not found in input
+CHECK:CHECK-NEXT: foo
+CHECK:            ^
+CHECK:<stdin>:2:1: note: scanning from here
+CHECK:string 2
+CHECK:^
+CHECK-EMPTY:
diff --git a/tests/integration/tests/check_commands/CHECK-NEXT/02-negative_match_line_exist_but_later/filecheck.check b/tests/integration/tests/check_commands/CHECK-NEXT/02-negative_match_line_exist_but_later/filecheck.check
@@ -1,2 +1,2 @@
-; CHECK: string 1
-; CHECK-NEXT: string 3
+CHECK: string 1
+CHECK-NEXT: string 3
diff --git a/tests/integration/tests/check_commands/CHECK-NEXT/02-negative_match_line_exist_but_later/sample.itest b/tests/integration/tests/check_commands/CHECK-NEXT/02-negative_match_line_exist_but_later/sample.itest
@@ -1,14 +1,14 @@
-; 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:2:15: error: CHECK-NEXT: is not on the line after the previous match{{$}}
-; CHECK-NEXT:; CHECK-NEXT: string 3
-; CHECK-NEXT:              ^
-; CHECK-NEXT:<stdin>:3:1: note: 'next' match was here
-; CHECK-NEXT:string 3
-; CHECK-NEXT:^
-; CHECK-NEXT:<stdin>:1:9: note: previous match ended here
-; CHECK-NEXT:string 1
-; CHECK-NEXT:        ^
-; CHECK-NEXT:<stdin>:2:1: note: non-matching line after previous match is here
-; CHECK-NEXT:string 2
-; CHECK-NEXT:^
+CHECK:{{.*}}filecheck.check:2:13: error: CHECK-NEXT: is not on the line after the previous match{{$}}
+CHECK-NEXT:CHECK-NEXT: string 3
+CHECK-NEXT:            ^
+CHECK-NEXT:<stdin>:3:1: note: 'next' match was here
+CHECK-NEXT:string 3
+CHECK-NEXT:^
+CHECK-NEXT:<stdin>:1:9: note: previous match ended here
+CHECK-NEXT:string 1
+CHECK-NEXT:        ^
+CHECK-NEXT:<stdin>:2:1: note: non-matching line after previous match is here
+CHECK-NEXT:string 2
+CHECK-NEXT:^
diff --git a/tests/integration/tests/check_commands/CHECK-NEXT/03-negative-match-check-next-on-the-first-line-no-match-exist/sample.itest b/tests/integration/tests/check_commands/CHECK-NEXT/03-negative-match-check-next-on-the-first-line-no-match-exist/sample.itest
@@ -1,6 +1,6 @@
-; RUN: %cat "%S/filecheck.input" | %expect_exit 2 %FILECHECK_EXEC "%S/filecheck.check" | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines
+RUN: %cat "%S/filecheck.input" | %expect_exit 2 %FILECHECK_EXEC "%S/filecheck.check" | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines
 
-; CHECK:{{^.*}}filecheck.check:1:4: error: found 'CHECK-NEXT' without previous 'CHECK: line{{$}}
-; CHECK:// CHECK-NEXT: 2
-; CHECK:   ^
-; CHECK-EMPTY:
+CHECK:{{^.*}}filecheck.check:1:4: error: found 'CHECK-NEXT' without previous 'CHECK: line{{$}}
+CHECK:// CHECK-NEXT: 2
+CHECK:   ^
+CHECK-EMPTY:
diff --git a/tests/integration/tests/check_commands/CHECK-NEXT/04-negative_regex_match/filecheck.check b/tests/integration/tests/check_commands/CHECK-NEXT/04-negative_regex_match/filecheck.check
@@ -1,2 +1,2 @@
-; CHECK: string 1
-; CHECK-NEXT: {{string 3}}
+CHECK: string 1
+CHECK-NEXT: {{string 3}}
diff --git a/tests/integration/tests/check_commands/CHECK-NEXT/04-negative_regex_match/sample.itest b/tests/integration/tests/check_commands/CHECK-NEXT/04-negative_regex_match/sample.itest
@@ -1,14 +1,14 @@
-; 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:2:15: error: CHECK-NEXT: is not on the line after the previous match{{$}}
-; CHECK-NEXT:{{^; CHECK-NEXT: ..string 3..$}}
-; CHECK-NEXT:              ^
-; CHECK-NEXT:<stdin>:3:1: note: 'next' match was here
-; CHECK-NEXT:string 3
-; CHECK-NEXT:^
-; CHECK-NEXT:<stdin>:1:9: note: previous match ended here
-; CHECK-NEXT:string 1
-; CHECK-NEXT:        ^
-; CHECK-NEXT:<stdin>:2:1: note: non-matching line after previous match is here
-; CHECK-NEXT:string 2
-; CHECK-NEXT:^
+CHECK:{{.*}}filecheck.check:2:13: error: CHECK-NEXT: is not on the line after the previous match{{$}}
+CHECK-NEXT:{{^CHECK-NEXT: ..string 3..$}}
+CHECK-NEXT:            ^
+CHECK-NEXT:<stdin>:3:1: note: 'next' match was here
+CHECK-NEXT:string 3
+CHECK-NEXT:^
+CHECK-NEXT:<stdin>:1:9: note: previous match ended here
+CHECK-NEXT:string 1
+CHECK-NEXT:        ^
+CHECK-NEXT:<stdin>:2:1: note: non-matching line after previous match is here
+CHECK-NEXT:string 2
+CHECK-NEXT:^
diff --git a/tests/integration/tests/check_commands/CHECK-NOT/multiple_strings/01-failing-CHECK-NOT-followed-by-valid-CHECK/filecheck.check b/tests/integration/tests/check_commands/CHECK-NOT/multiple_strings/01-failing-CHECK-NOT-followed-by-valid-CHECK/filecheck.check
@@ -1,2 +1,2 @@
-; CHECK-NOT:{{.*String1.*}}
-; CHECK:String2
+CHECK-NOT:{{.*String1.*}}
+CHECK:String2
diff --git a/tests/integration/tests/check_commands/CHECK-NOT/multiple_strings/01-failing-CHECK-NOT-followed-by-valid-CHECK/sample.itest b/tests/integration/tests/check_commands/CHECK-NOT/multiple_strings/01-failing-CHECK-NOT-followed-by-valid-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:{{^.*}}:1:13: error: CHECK-NOT: excluded string found in input
-; CHECK:{{; CHECK-NOT:..\.\*String1.*..}}
-; CHECK:{{^            \^$}}
-; CHECK:<stdin>:2:1: note: found here
-; CHECK:String1
-; CHECK:^~~~~~~
-; CHECK-EMPTY:
+CHECK:{{^.*}}:1:11: error: CHECK-NOT: excluded string found in input
+CHECK:{{CHECK-NOT:..\.\*String1.*..}}
+CHECK:{{^          \^$}}
+CHECK:<stdin>:2:1: note: found here
+CHECK:String1
+CHECK:^~~~~~~
+CHECK-EMPTY:
diff --git a/tests/integration/tests/check_commands/CHECK-NOT/multiple_strings/02-CHECK-NOT-is-the-last-check-and-multiple-to-check-yet/filecheck.check b/tests/integration/tests/check_commands/CHECK-NOT/multiple_strings/02-CHECK-NOT-is-the-last-check-and-multiple-to-check-yet/filecheck.check
@@ -1 +1 @@
-; CHECK-NOT:String5
+CHECK-NOT:String5
diff --git a/tests/integration/tests/check_commands/CHECK-NOT/multiple_strings/02-CHECK-NOT-is-the-last-check-and-multiple-to-check-yet/sample.itest b/tests/integration/tests/check_commands/CHECK-NOT/multiple_strings/02-CHECK-NOT-is-the-last-check-and-multiple-to-check-yet/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:1:13: error: CHECK-NOT: excluded string found in input{{$}}
-; CHECK:; CHECK-NOT:String5
-; CHECK:            ^
-; CHECK:<stdin>:5:1: note: found here
-; CHECK:String5
-; CHECK:^~~~~~~
-; CHECK-EMPTY:
+CHECK:{{^.*}}filecheck.check:1:11: error: CHECK-NOT: excluded string found in input{{$}}
+CHECK:CHECK-NOT:String5
+CHECK:          ^
+CHECK:<stdin>:5:1: note: found here
+CHECK:String5
+CHECK:^~~~~~~
+CHECK-EMPTY:
diff --git a/tests/integration/tests/check_commands/CHECK-NOT/multiple_strings/03-CHECK-NOT-has-no-effect-if-next-CHECK-passed/filecheck.check b/tests/integration/tests/check_commands/CHECK-NOT/multiple_strings/03-CHECK-NOT-has-no-effect-if-next-CHECK-passed/filecheck.check
@@ -1,2 +1,2 @@
-; CHECK:String2
-; CHECK-NOT:{{.*String1.*}}
+CHECK:String2
+CHECK-NOT:{{.*String1.*}}
diff --git a/tests/integration/tests/check_commands/CHECK-NOT/multiple_strings/04-when-no-input-anymore-filters-out-CHECK-NOT-but-fails-on-CHECK/filecheck.check b/tests/integration/tests/check_commands/CHECK-NOT/multiple_strings/04-when-no-input-anymore-filters-out-CHECK-NOT-but-fails-on-CHECK/filecheck.check
@@ -1,3 +1,3 @@
-; CHECK:String2
-; CHECK-NOT:{{.*String1.*}}
-; CHECK:String3
+CHECK:String2
+CHECK-NOT:{{.*String1.*}}
+CHECK:String3
diff --git a/tests/integration/tests/check_commands/CHECK-NOT/multiple_strings/04-when-no-input-anymore-filters-out-CHECK-NOT-but-fails-on-CHECK/sample.itest b/tests/integration/tests/check_commands/CHECK-NOT/multiple_strings/04-when-no-input-anymore-filters-out-CHECK-NOT-but-fails-on-CHECK/sample.itest
@@ -1,13 +1,13 @@
-; 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:9: error: CHECK: expected string not found in input{{$}}
-; CHECK:; CHECK:String3
-; CHECK:        ^
-; TODO: Without --match-full-lines, LLVM FileCheck allows multiple checks on a same line #52
-; TODO: https://github.com/stanislaw/FileCheck.py/issues/52
-; CHECK:{{<stdin>:(1|2):(8|1): note: scanning from here}}
-; CHECK:{{.*}}
-; CHECK:{{.*^}}
-; TODO: "note: possible intended match here" feature: not clear when FileCheck decides to show it or not #63
-; TODO: https://github.com/stanislaw/FileCheck.py/issues/63
-; CHECK-EMPTY
+CHECK:{{^.*}}filecheck.check:3:7: error: CHECK: expected string not found in input{{$}}
+CHECK:CHECK:String3
+CHECK:      ^
+TODO: Without --match-full-lines, LLVM FileCheck allows multiple checks on a same line #52
+TODO: https://github.com/stanislaw/FileCheck.py/issues/52
+CHECK:{{<stdin>:(1|2):(8|1): note: scanning from here}}
+CHECK:{{.*}}
+CHECK:{{.*^}}
+TODO: "note: possible intended match here" feature: not clear when FileCheck decides to show it or not #63
+TODO: https://github.com/stanislaw/FileCheck.py/issues/63
+CHECK-EMPTY
diff --git a/tests/integration/tests/check_commands/CHECK-NOT/multiple_strings/06-multiple-CHECK-NOT-all-have-effect/filecheck.check b/tests/integration/tests/check_commands/CHECK-NOT/multiple_strings/06-multiple-CHECK-NOT-all-have-effect/filecheck.check
@@ -1,2 +1,2 @@
-; CHECK-NOT:warning
-; CHECK-NOT:error
+CHECK-NOT:warning
+CHECK-NOT:error
diff --git a/tests/integration/tests/check_commands/CHECK-NOT/multiple_strings/06-multiple-CHECK-NOT-all-have-effect/sample.itest b/tests/integration/tests/check_commands/CHECK-NOT/multiple_strings/06-multiple-CHECK-NOT-all-have-effect/sample.itest
@@ -1,7 +1,7 @@
-; 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:; CHECK-NOT:warning
-; CHECK:            ^
-; CHECK:<stdin>:2:1: note: found here
-; CHECK:warning
-; CHECK:^~~~~~~
+CHECK:CHECK-NOT:warning
+CHECK:          ^
+CHECK:<stdin>:2:1: note: found here
+CHECK:warning
+CHECK:^~~~~~~
diff --git a/tests/integration/tests/check_commands/CHECK-NOT/multiple_strings/07-multiple-CHECK-NOT-do-not-get-shadowed-by-each-other/filecheck.check b/tests/integration/tests/check_commands/CHECK-NOT/multiple_strings/07-multiple-CHECK-NOT-do-not-get-shadowed-by-each-other/filecheck.check
@@ -1,2 +1,2 @@
-; CHECK-NOT:warning
-; CHECK-NOT:error
+CHECK-NOT:warning
+CHECK-NOT:error
diff --git a/tests/integration/tests/check_commands/CHECK-NOT/multiple_strings/07-multiple-CHECK-NOT-do-not-get-shadowed-by-each-other/sample.itest b/tests/integration/tests/check_commands/CHECK-NOT/multiple_strings/07-multiple-CHECK-NOT-do-not-get-shadowed-by-each-other/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:1:13: error: CHECK-NOT: excluded string found in input
-; CHECK:; CHECK-NOT:warning
-; CHECK:            ^
-; CHECK:<stdin>:1:1: note: found here
-; CHECK:warning
-; CHECK:^~~~~~~
-; CHECK-EMPTY:
+CHECK:{{^.*}}filecheck.check:1:11: error: CHECK-NOT: excluded string found in input
+CHECK:CHECK-NOT:warning
+CHECK:          ^
+CHECK:<stdin>:1:1: note: found here
+CHECK:warning
+CHECK:^~~~~~~
+CHECK-EMPTY:
diff --git a/tests/integration/tests/check_commands/CHECK-NOT/multiple_strings/CHECK-has-a-higher-priority-than-CHECK-NOT/01-minimal-example/filecheck.check b/tests/integration/tests/check_commands/CHECK-NOT/multiple_strings/CHECK-has-a-higher-priority-than-CHECK-NOT/01-minimal-example/filecheck.check
@@ -1,2 +1,2 @@
-; CHECK-NOT:String1
-; CHECK:String2
+CHECK-NOT:String1
+CHECK:String2
diff --git a/tests/integration/tests/check_commands/CHECK-NOT/multiple_strings/CHECK-has-a-higher-priority-than-CHECK-NOT/01-minimal-example/sample.itest b/tests/integration/tests/check_commands/CHECK-NOT/multiple_strings/CHECK-has-a-higher-priority-than-CHECK-NOT/01-minimal-example/sample.itest
@@ -1,11 +1,12 @@
-; 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:2:9: error: CHECK: expected string not found in input
-; CHECK:; CHECK:String2
-; CHECK:        ^
-; CHECK:<stdin>:1:1: note: scanning from here
-; CHECK:String1
-; CHECK:^
-; TODO: Difference in behavior: FileCheck.py prints possible intended match,
-; TODO: while FileCheck C++ does not.
-; CHECK-EMPTY
+CHECK:{{^.*}}filecheck.check:2:7: error: CHECK: expected string not found in input
+CHECK:CHECK:String2
+CHECK:      ^
+CHECK:<stdin>:1:1: note: scanning from here
+CHECK:String1
+CHECK:^
+
+TODO: Difference in behavior: FileCheck.py prints possible intended match,
+TODO: while FileCheck C++ does not.
+CHECK-EMPTY
diff --git a/tests/integration/tests/check_commands/CHECK-NOT/multiple_strings/CHECK-has-a-higher-priority-than-CHECK-NOT/02-example-with-placeholder-string/filecheck.check b/tests/integration/tests/check_commands/CHECK-NOT/multiple_strings/CHECK-has-a-higher-priority-than-CHECK-NOT/02-example-with-placeholder-string/filecheck.check
@@ -1,2 +1,2 @@
-; CHECK-NOT:{{.*String2.*}}
-; CHECK:String3
+CHECK-NOT:{{.*String2.*}}
+CHECK:String3
diff --git a/tests/integration/tests/check_commands/CHECK-NOT/multiple_strings/CHECK-has-a-higher-priority-than-CHECK-NOT/02-example-with-placeholder-string/sample.itest b/tests/integration/tests/check_commands/CHECK-NOT/multiple_strings/CHECK-has-a-higher-priority-than-CHECK-NOT/02-example-with-placeholder-string/sample.itest
@@ -1,11 +1,12 @@
-; 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:{{^.*}}:2:9: error: CHECK: expected string not found in input
-; CHECK:; CHECK:String3
-; CHECK:        ^
-; CHECK:<stdin>:1:1: note: scanning from here
-; CHECK:String1
-; CHECK:^
-; TODO: Difference in behavior: FileCheck.py prints possible intended match,
-; TODO: while FileCheck C++ does not.
-; CHECK-EMPTY
+CHECK:{{^.*}}:2:7: error: CHECK: expected string not found in input
+CHECK:CHECK:String3
+CHECK:      ^
+CHECK:<stdin>:1:1: note: scanning from here
+CHECK:String1
+CHECK:^
+
+TODO: Difference in behavior: FileCheck.py prints possible intended match,
+TODO: while FileCheck C++ does not.
+CHECK-EMPTY
diff --git a/tests/integration/tests/check_commands/CHECK-NOT/one_string/negative/01-negative_match/filecheck.check b/tests/integration/tests/check_commands/CHECK-NOT/one_string/negative/01-negative_match/filecheck.check
@@ -1 +1 @@
-; CHECK-NOT: hello
+CHECK-NOT: hello
diff --git a/tests/integration/tests/check_commands/CHECK-NOT/one_string/negative/01-negative_match/sample.itest b/tests/integration/tests/check_commands/CHECK-NOT/one_string/negative/01-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" --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:1:14: error: CHECK-NOT: excluded string found in input{{$}}
-; CHECK-NEXT:; CHECK-NOT: hello
-; CHECK-NEXT:             ^
-; CHECK-NEXT:<stdin>:1:1: note: found here
-; CHECK-NEXT:hello
-; CHECK-NEXT:^~~~~
-; CHECK-EMPTY:
+CHECK:{{^.*}}filecheck.check:1:12: error: CHECK-NOT: excluded string found in input{{$}}
+CHECK-NEXT:CHECK-NOT: hello
+CHECK-NEXT:           ^
+CHECK-NEXT:<stdin>:1:1: note: found here
+CHECK-NEXT:hello
+CHECK-NEXT:^~~~~
+CHECK-EMPTY:
diff --git a/tests/integration/tests/check_commands/CHECK-NOT/one_string/negative/02-negative_match_whitespaces/filecheck.check b/tests/integration/tests/check_commands/CHECK-NOT/one_string/negative/02-negative_match_whitespaces/filecheck.check
@@ -1 +1 @@
-; CHECK-NOT: hello   world
+CHECK-NOT: hello   world
diff --git a/tests/integration/tests/check_commands/CHECK-NOT/one_string/negative/02-negative_match_whitespaces/sample.itest b/tests/integration/tests/check_commands/CHECK-NOT/one_string/negative/02-negative_match_whitespaces/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:1:14: error: CHECK-NOT: excluded string found in input{{$}}
-; CHECK-NEXT:{{^; CHECK-NOT: hello world$}}
-; CHECK-NEXT:{{^             \^$}}
-; CHECK-NEXT:<stdin>:1:1: note: found here
-; CHECK-NEXT:{{^hello world$}}
-; CHECK-NEXT:{{^\^~+$}}
-; CHECK-EMPTY:
+CHECK:{{^.*}}filecheck.check:1:12: error: CHECK-NOT: excluded string found in input{{$}}
+CHECK-NEXT:{{^CHECK-NOT: hello world$}}
+CHECK-NEXT:{{^           \^$}}
+CHECK-NEXT:<stdin>:1:1: note: found here
+CHECK-NEXT:{{^hello world$}}
+CHECK-NEXT:{{^\^~+$}}
+CHECK-EMPTY:
