From d991830b1da56dd85e98d2f52246818504d87015 Mon Sep 17 00:00:00 2001 From: Stanislav Pankevich Date: Sun, 5 Dec 2021 09:58:01 +0100 Subject: [PATCH 1/2] Code climate: convert one test to --strict-whitespace --- .../03-negative_match_regex/filecheck.check | 2 +- .../03-negative_match_regex/sample.itest | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tests/integration/tests/check_commands/CHECK-NOT/one_string/negative/03-negative_match_regex/filecheck.check b/tests/integration/tests/check_commands/CHECK-NOT/one_string/negative/03-negative_match_regex/filecheck.check index 34751e0..9a4a972 100644 --- a/tests/integration/tests/check_commands/CHECK-NOT/one_string/negative/03-negative_match_regex/filecheck.check +++ b/tests/integration/tests/check_commands/CHECK-NOT/one_string/negative/03-negative_match_regex/filecheck.check @@ -1 +1 @@ -; CHECK-NOT: {{^h.l.o$}} +CHECK-NOT: {{^h.l.o$}} diff --git a/tests/integration/tests/check_commands/CHECK-NOT/one_string/negative/03-negative_match_regex/sample.itest b/tests/integration/tests/check_commands/CHECK-NOT/one_string/negative/03-negative_match_regex/sample.itest index 64ad1f1..edbad24 100644 --- a/tests/integration/tests/check_commands/CHECK-NOT/one_string/negative/03-negative_match_regex/sample.itest +++ b/tests/integration/tests/check_commands/CHECK-NOT/one_string/negative/03-negative_match_regex/sample.itest @@ -1,12 +1,12 @@ -; 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 --strict-whitespace -; CHECK: {{^.*}}filecheck.check:1:14: error: CHECK-NOT: excluded string found in input{{$}} +CHECK:{{^.*}}filecheck.check:1:12: error: CHECK-NOT: excluded string found in input{{$}} ; TODO: Here we could do a better match. -; CHECK-NEXT: {{^; CHECK-NOT: ...h.l.o...$}} +CHECK-NEXT:{{^CHECK-NOT: ...h.l.o...$}} ; TODO: Real FileCheck ignores whitespaces even when regex is passed. ; TODO: The next step is to check the --strict-whitespace option. -; CHECK-NEXT: {{^ \^$}} -; CHECK-NEXT: {{^:.*:.*: note: found here$}} -; CHECK-NEXT: {{^}}hello{{$}} -; CHECK-NEXT: {{^}}^~~~~{{$}} -; CHECK-EMPTY: +CHECK-NEXT: ^ +CHECK-NEXT:{{^:.*:.*: note: found here$}} +CHECK-NEXT:hello +CHECK-NEXT:^~~~~ +CHECK-EMPTY: From 95a888c92cc51c29ef0b0892a4978c9354e348ed Mon Sep 17 00:00:00 2001 From: Stanislav Pankevich Date: Sun, 5 Dec 2021 10:00:03 +0100 Subject: [PATCH 2/2] Code climate: fix next batch of "; " occurences --- .../filecheck.check | 2 +- .../sample.itest | 16 +++++----- .../01-positive_match/filecheck.check | 2 +- .../positive/01-positive_match/sample.itest | 2 +- .../filecheck.check | 8 ++--- .../sample.itest | 2 +- .../03-positive_match_regex/filecheck.check | 2 +- .../filecheck.check | 2 +- .../sample.itest | 29 ++++++++++--------- .../01-negative_match/filecheck.check | 2 +- .../01-negative_match/sample.itest | 22 +++++++------- .../02-negative_regex_match/filecheck.check | 2 +- .../02-negative_regex_match/sample.itest | 16 +++++----- .../filecheck.check | 2 +- .../sample.itest | 23 ++++++++------- .../sample.itest | 16 +++++----- .../01-positive_match/filecheck.check | 2 +- .../filecheck.check | 2 +- .../03-positive_regex_match/filecheck.check | 2 +- .../filecheck.check | 2 +- .../01-positive_match/filecheck.check | 6 ++-- .../filecheck.check | 6 ++-- 22 files changed, 85 insertions(+), 83 deletions(-) diff --git a/tests/integration/tests/check_commands/CHECK-NOT/one_string/negative/04-negative-match-regex-escaping_non_regex_parts/filecheck.check b/tests/integration/tests/check_commands/CHECK-NOT/one_string/negative/04-negative-match-regex-escaping_non_regex_parts/filecheck.check index 8f5771b..e276a30 100644 --- a/tests/integration/tests/check_commands/CHECK-NOT/one_string/negative/04-negative-match-regex-escaping_non_regex_parts/filecheck.check +++ b/tests/integration/tests/check_commands/CHECK-NOT/one_string/negative/04-negative-match-regex-escaping_non_regex_parts/filecheck.check @@ -1 +1 @@ -; CHECK-NOT: {{^}}The following braces must be escaped by FileCheck: ( inside braces ): 0/1{{$}} +CHECK-NOT: {{^}}The following braces must be escaped by FileCheck: ( inside braces ): 0/1{{$}} diff --git a/tests/integration/tests/check_commands/CHECK-NOT/one_string/negative/04-negative-match-regex-escaping_non_regex_parts/sample.itest b/tests/integration/tests/check_commands/CHECK-NOT/one_string/negative/04-negative-match-regex-escaping_non_regex_parts/sample.itest index 4ff5fac..3d5770f 100644 --- a/tests/integration/tests/check_commands/CHECK-NOT/one_string/negative/04-negative-match-regex-escaping_non_regex_parts/sample.itest +++ b/tests/integration/tests/check_commands/CHECK-NOT/one_string/negative/04-negative-match-regex-escaping_non_regex_parts/sample.itest @@ -1,12 +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:1:14: error: CHECK-NOT: excluded string found in input{{$}} +CHECK:{{^.*}}filecheck.check:1:12: error: CHECK-NOT: excluded string found in input{{$}} ; TODO: Here we could do a better match. -; CHECK-NEXT:{{^; CHECK-NOT: .....The following braces must be escaped by FileCheck: \( inside braces \): 0\/1.....$}} +CHECK-NEXT:{{^CHECK-NOT: .....The following braces must be escaped by FileCheck: \( inside braces \): 0\/1.....$}} ; TODO: Real FileCheck ignores whitespaces even when regex is passed. ; TODO: The next step is to check the --strict-whitespace option. -; CHECK-NEXT:{{^ \^$}} -; CHECK-NEXT:{{^:1:1: note: found here$}} -; CHECK-NEXT:{{^}}The following braces must be escaped by FileCheck: ( inside braces ): 0/1{{$}} -; CHECK-NEXT:{{^}}^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{{$}} -; CHECK-EMPTY: +CHECK-NEXT:{{^ \^$}} +CHECK-NEXT:{{^:1:1: note: found here$}} +CHECK-NEXT:{{^}}The following braces must be escaped by FileCheck: ( inside braces ): 0/1{{$}} +CHECK-NEXT:{{^}}^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{{$}} +CHECK-EMPTY: diff --git a/tests/integration/tests/check_commands/CHECK-NOT/one_string/positive/01-positive_match/filecheck.check b/tests/integration/tests/check_commands/CHECK-NOT/one_string/positive/01-positive_match/filecheck.check index 920d6b1..d6123c3 100644 --- a/tests/integration/tests/check_commands/CHECK-NOT/one_string/positive/01-positive_match/filecheck.check +++ b/tests/integration/tests/check_commands/CHECK-NOT/one_string/positive/01-positive_match/filecheck.check @@ -1 +1 @@ -; CHECK-NOT: hello \ No newline at end of file +CHECK-NOT: hello \ No newline at end of file diff --git a/tests/integration/tests/check_commands/CHECK-NOT/one_string/positive/01-positive_match/sample.itest b/tests/integration/tests/check_commands/CHECK-NOT/one_string/positive/01-positive_match/sample.itest index ed5ddc6..6b675bd 100644 --- a/tests/integration/tests/check_commands/CHECK-NOT/one_string/positive/01-positive_match/sample.itest +++ b/tests/integration/tests/check_commands/CHECK-NOT/one_string/positive/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-NOT/one_string/positive/02-positive_check_effective_only_one_line_before_next_check/filecheck.check b/tests/integration/tests/check_commands/CHECK-NOT/one_string/positive/02-positive_check_effective_only_one_line_before_next_check/filecheck.check index 4e146d9..7e83e02 100644 --- a/tests/integration/tests/check_commands/CHECK-NOT/one_string/positive/02-positive_check_effective_only_one_line_before_next_check/filecheck.check +++ b/tests/integration/tests/check_commands/CHECK-NOT/one_string/positive/02-positive_check_effective_only_one_line_before_next_check/filecheck.check @@ -1,4 +1,4 @@ -; CHECK: string1 -; CHECK-NOT: hello -; CHECK: string2 -; CHECK: string3 +CHECK: string1 +CHECK-NOT: hello +CHECK: string2 +CHECK: string3 diff --git a/tests/integration/tests/check_commands/CHECK-NOT/one_string/positive/02-positive_check_effective_only_one_line_before_next_check/sample.itest b/tests/integration/tests/check_commands/CHECK-NOT/one_string/positive/02-positive_check_effective_only_one_line_before_next_check/sample.itest index ed5ddc6..6b675bd 100644 --- a/tests/integration/tests/check_commands/CHECK-NOT/one_string/positive/02-positive_check_effective_only_one_line_before_next_check/sample.itest +++ b/tests/integration/tests/check_commands/CHECK-NOT/one_string/positive/02-positive_check_effective_only_one_line_before_next_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-NOT/one_string/positive/03-positive_match_regex/filecheck.check b/tests/integration/tests/check_commands/CHECK-NOT/one_string/positive/03-positive_match_regex/filecheck.check index 3ee8a46..a866e1b 100644 --- a/tests/integration/tests/check_commands/CHECK-NOT/one_string/positive/03-positive_match_regex/filecheck.check +++ b/tests/integration/tests/check_commands/CHECK-NOT/one_string/positive/03-positive_match_regex/filecheck.check @@ -1 +1 @@ -; CHECK-NOT: {{hello}} \ No newline at end of file +CHECK-NOT: {{hello}} \ No newline at end of file diff --git a/tests/integration/tests/check_commands/CHECK/many_strings/01-negative-match-of-string-between-many-placeholder-strings/filecheck.check b/tests/integration/tests/check_commands/CHECK/many_strings/01-negative-match-of-string-between-many-placeholder-strings/filecheck.check index 43a5cc2..f23b4af 100644 --- a/tests/integration/tests/check_commands/CHECK/many_strings/01-negative-match-of-string-between-many-placeholder-strings/filecheck.check +++ b/tests/integration/tests/check_commands/CHECK/many_strings/01-negative-match-of-string-between-many-placeholder-strings/filecheck.check @@ -1 +1 @@ -; CHECK:{{STRINGGG}} +CHECK:{{STRINGGG}} diff --git a/tests/integration/tests/check_commands/CHECK/many_strings/01-negative-match-of-string-between-many-placeholder-strings/sample.itest b/tests/integration/tests/check_commands/CHECK/many_strings/01-negative-match-of-string-between-many-placeholder-strings/sample.itest index 473106b..ee4b611 100644 --- a/tests/integration/tests/check_commands/CHECK/many_strings/01-negative-match-of-string-between-many-placeholder-strings/sample.itest +++ b/tests/integration/tests/check_commands/CHECK/many_strings/01-negative-match-of-string-between-many-placeholder-strings/sample.itest @@ -1,15 +1,16 @@ -; RUN: %cat "%S/filecheck.input" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" --strict-whitespace --match-full-lines | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines +RUN: %cat "%S/filecheck.input" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" --strict-whitespace --match-full-lines | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines -; CHECK:{{^.*}}filecheck.check:1:9: error: CHECK: expected string not found in input -; CHECK-NEXT:{{^; CHECK:..STRINGGG..$}} -; CHECK-NEXT:{{^ \^$}} -; CHECK-NEXT::1:1: note: scanning from here -; CHECK-NEXT:PLACEHOLDER BEFORE 1 -; CHECK-NEXT:^ -; TODO: Again, the "note: possible intended match here" feature needs revision, #38 -; TODO: https://github.com/stanislaw/FileCheck.py/issues/38. -; TODO: Doing (1|17) and ".*\^" for now. -; CHECK-NEXT::5:{{(1|4)}}: note: possible intended match here -; CHECK-NEXT:STRING -; CHECK-NEXT:{{^.*\^$}} -; CHECK-EMPTY: +CHECK:{{^.*}}filecheck.check:1:7: error: CHECK: expected string not found in input +CHECK-NEXT:{{^CHECK:..STRINGGG..$}} +CHECK-NEXT:{{^ \^$}} +CHECK-NEXT::1:1: note: scanning from here +CHECK-NEXT:PLACEHOLDER BEFORE 1 +CHECK-NEXT:^ + +TODO: Again, the "note: possible intended match here" feature needs revision, #38 +TODO: https://github.com/stanislaw/FileCheck.py/issues/38. +TODO: Doing (1|17) and ".*\^" for now. +CHECK-NEXT::5:{{(1|4)}}: note: possible intended match here +CHECK-NEXT:STRING +CHECK-NEXT:{{^.*\^$}} +CHECK-EMPTY: diff --git a/tests/integration/tests/check_commands/CHECK/one_string/negative-match/01-negative_match/filecheck.check b/tests/integration/tests/check_commands/CHECK/one_string/negative-match/01-negative_match/filecheck.check index 2036aff..50dc718 100644 --- a/tests/integration/tests/check_commands/CHECK/one_string/negative-match/01-negative_match/filecheck.check +++ b/tests/integration/tests/check_commands/CHECK/one_string/negative-match/01-negative_match/filecheck.check @@ -1 +1 @@ -; CHECK: foo +CHECK: foo diff --git a/tests/integration/tests/check_commands/CHECK/one_string/negative-match/01-negative_match/sample.itest b/tests/integration/tests/check_commands/CHECK/one_string/negative-match/01-negative_match/sample.itest index cc9af8f..3cf30e3 100644 --- a/tests/integration/tests/check_commands/CHECK/one_string/negative-match/01-negative_match/sample.itest +++ b/tests/integration/tests/check_commands/CHECK/one_string/negative-match/01-negative_match/sample.itest @@ -1,12 +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:1:10: error: CHECK: expected string not found in input{{$}} -; CHECK:{{^}}; CHECK: foo{{$}} -; CHECK:{{^}} ^{{$}} -; CHECK::1:1: note: scanning from here -; CHECK:hello -; CHECK:^ -; CHECK::1:3: note: possible intended match here -; CHECK:hello -; CHECK: ^ -; CHECK-EMPTY +CHECK:{{.*}}filecheck.check:1:8: error: CHECK: expected string not found in input{{$}} +CHECK:{{^}}CHECK: foo{{$}} +CHECK:{{^}} ^{{$}} +CHECK::1:1: note: scanning from here +CHECK:hello +CHECK:^ +CHECK::1:3: note: possible intended match here +CHECK:hello +CHECK: ^ +CHECK-EMPTY diff --git a/tests/integration/tests/check_commands/CHECK/one_string/negative-match/02-negative_regex_match/filecheck.check b/tests/integration/tests/check_commands/CHECK/one_string/negative-match/02-negative_regex_match/filecheck.check index 7e4d0d0..f2d95a4 100644 --- a/tests/integration/tests/check_commands/CHECK/one_string/negative-match/02-negative_regex_match/filecheck.check +++ b/tests/integration/tests/check_commands/CHECK/one_string/negative-match/02-negative_regex_match/filecheck.check @@ -1 +1 @@ -; CHECK: {{^}}hello{{$}} +CHECK: {{^}}hello{{$}} diff --git a/tests/integration/tests/check_commands/CHECK/one_string/negative-match/02-negative_regex_match/sample.itest b/tests/integration/tests/check_commands/CHECK/one_string/negative-match/02-negative_regex_match/sample.itest index bcddff1..9bbe04c 100644 --- a/tests/integration/tests/check_commands/CHECK/one_string/negative-match/02-negative_regex_match/sample.itest +++ b/tests/integration/tests/check_commands/CHECK/one_string/negative-match/02-negative_regex_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:10: error: CHECK: expected string not found in input{{$}} -; CHECK-NEXT:{{^; CHECK: .....hello.....$}} -; CHECK-NEXT:{{^ \^$}} -; CHECK-NEXT::1:1: note: scanning from here -; CHECK-NEXT:h e llo -; CHECK-NEXT:^ -; CHECK-EMPTY: +CHECK:{{.*}}filecheck.check:1:8: error: CHECK: expected string not found in input{{$}} +CHECK-NEXT:{{^CHECK: .....hello.....$}} +CHECK-NEXT:{{^ \^$}} +CHECK-NEXT::1:1: note: scanning from here +CHECK-NEXT:h e llo +CHECK-NEXT:^ +CHECK-EMPTY: diff --git a/tests/integration/tests/check_commands/CHECK/one_string/negative-match/03-negative_regex_match_spaces_before_string/filecheck.check b/tests/integration/tests/check_commands/CHECK/one_string/negative-match/03-negative_regex_match_spaces_before_string/filecheck.check index 7e4d0d0..f2d95a4 100644 --- a/tests/integration/tests/check_commands/CHECK/one_string/negative-match/03-negative_regex_match_spaces_before_string/filecheck.check +++ b/tests/integration/tests/check_commands/CHECK/one_string/negative-match/03-negative_regex_match_spaces_before_string/filecheck.check @@ -1 +1 @@ -; CHECK: {{^}}hello{{$}} +CHECK: {{^}}hello{{$}} diff --git a/tests/integration/tests/check_commands/CHECK/one_string/negative-match/03-negative_regex_match_spaces_before_string/sample.itest b/tests/integration/tests/check_commands/CHECK/one_string/negative-match/03-negative_regex_match_spaces_before_string/sample.itest index e453e4d..8b0eb9e 100644 --- a/tests/integration/tests/check_commands/CHECK/one_string/negative-match/03-negative_regex_match_spaces_before_string/sample.itest +++ b/tests/integration/tests/check_commands/CHECK/one_string/negative-match/03-negative_regex_match_spaces_before_string/sample.itest @@ -1,12 +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:1:10: error: CHECK: expected string not found in input{{$}} -; CHECK-NEXT:{{^; CHECK: .....hello.....$}} -; CHECK-NEXT:{{^ \^$}} -; TODO: It is weird that FileCheck C++ eats whitespaces and therefore does not -; TODO: show original line which was not possible to match. -; TODO: We prefer to print original lines, so regex below accommodates this. -; CHECK-NEXT:{{^:1:(1|2): note: scanning from here$}} -; CHECK-NEXT:{{^ ( )?h e llo$}} -; CHECK-NEXT:{{^ ?\^$}} -; CHECK-EMPTY: +CHECK:{{.*}}filecheck.check:1:8: error: CHECK: expected string not found in input{{$}} +CHECK-NEXT:{{^CHECK: .....hello.....$}} +CHECK-NEXT:{{^ \^$}} + +TODO: It is weird that FileCheck C++ eats whitespaces and therefore does not +TODO: show original line which was not possible to match. +TODO: We prefer to print original lines, so regex below accommodates this. +CHECK-NEXT:{{^:1:(1|2): note: scanning from here$}} +CHECK-NEXT:{{^ ( )?h e llo$}} +CHECK-NEXT:{{^ ?\^$}} +CHECK-EMPTY: diff --git a/tests/integration/tests/check_commands/CHECK/one_string/negative-match/04-negative_match_no_input_lines_anymore/sample.itest b/tests/integration/tests/check_commands/CHECK/one_string/negative-match/04-negative_match_no_input_lines_anymore/sample.itest index 5241b94..1afebfd 100644 --- a/tests/integration/tests/check_commands/CHECK/one_string/negative-match/04-negative_match_no_input_lines_anymore/sample.itest +++ b/tests/integration/tests/check_commands/CHECK/one_string/negative-match/04-negative_match_no_input_lines_anymore/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:8: error: CHECK: expected string not found in input{{$}} -; CHECK:CHECK: String2 -; CHECK: ^ -; CHECK::1:8: note: scanning from here -; CHECK:String1 -; CHECK: ^ -; CHECK-EMPTY: +CHECK:{{^.*}}filecheck.check:2:8: error: CHECK: expected string not found in input{{$}} +CHECK:CHECK: String2 +CHECK: ^ +CHECK::1:8: note: scanning from here +CHECK:String1 +CHECK: ^ +CHECK-EMPTY: diff --git a/tests/integration/tests/check_commands/CHECK/one_string/positive-match/01-positive_match/filecheck.check b/tests/integration/tests/check_commands/CHECK/one_string/positive-match/01-positive_match/filecheck.check index c200635..e7bbab2 100644 --- a/tests/integration/tests/check_commands/CHECK/one_string/positive-match/01-positive_match/filecheck.check +++ b/tests/integration/tests/check_commands/CHECK/one_string/positive-match/01-positive_match/filecheck.check @@ -1 +1 @@ -; CHECK: hello +CHECK: hello diff --git a/tests/integration/tests/check_commands/CHECK/one_string/positive-match/02-positive_match_whitespaces/filecheck.check b/tests/integration/tests/check_commands/CHECK/one_string/positive-match/02-positive_match_whitespaces/filecheck.check index 63b2121..7cb518c 100644 --- a/tests/integration/tests/check_commands/CHECK/one_string/positive-match/02-positive_match_whitespaces/filecheck.check +++ b/tests/integration/tests/check_commands/CHECK/one_string/positive-match/02-positive_match_whitespaces/filecheck.check @@ -1 +1 @@ -; CHECK: three different words +CHECK: three different words diff --git a/tests/integration/tests/check_commands/CHECK/one_string/positive-match/03-positive_regex_match/filecheck.check b/tests/integration/tests/check_commands/CHECK/one_string/positive-match/03-positive_regex_match/filecheck.check index 7e4d0d0..f2d95a4 100644 --- a/tests/integration/tests/check_commands/CHECK/one_string/positive-match/03-positive_regex_match/filecheck.check +++ b/tests/integration/tests/check_commands/CHECK/one_string/positive-match/03-positive_regex_match/filecheck.check @@ -1 +1 @@ -; CHECK: {{^}}hello{{$}} +CHECK: {{^}}hello{{$}} diff --git a/tests/integration/tests/check_commands/CHECK/one_string/positive-match/04-escaping_non_regex_parts/filecheck.check b/tests/integration/tests/check_commands/CHECK/one_string/positive-match/04-escaping_non_regex_parts/filecheck.check index 18922bb..6aa06e0 100644 --- a/tests/integration/tests/check_commands/CHECK/one_string/positive-match/04-escaping_non_regex_parts/filecheck.check +++ b/tests/integration/tests/check_commands/CHECK/one_string/positive-match/04-escaping_non_regex_parts/filecheck.check @@ -1 +1 @@ -; CHECK: {{^}}The following braces must be escaped by FileCheck: ( inside braces ): 0/1{{$}} +CHECK: {{^}}The following braces must be escaped by FileCheck: ( inside braces ): 0/1{{$}} diff --git a/tests/integration/tests/check_commands/CHECK/three_strings/01-positive_match/filecheck.check b/tests/integration/tests/check_commands/CHECK/three_strings/01-positive_match/filecheck.check index ce0614c..453825c 100644 --- a/tests/integration/tests/check_commands/CHECK/three_strings/01-positive_match/filecheck.check +++ b/tests/integration/tests/check_commands/CHECK/three_strings/01-positive_match/filecheck.check @@ -1,3 +1,3 @@ -; CHECK: hello1 -; CHECK: hello2 -; CHECK: hello3 +CHECK: hello1 +CHECK: hello2 +CHECK: hello3 diff --git a/tests/integration/tests/check_commands/CHECK/three_strings/02-positive_match-one-line-between/filecheck.check b/tests/integration/tests/check_commands/CHECK/three_strings/02-positive_match-one-line-between/filecheck.check index ce0614c..453825c 100644 --- a/tests/integration/tests/check_commands/CHECK/three_strings/02-positive_match-one-line-between/filecheck.check +++ b/tests/integration/tests/check_commands/CHECK/three_strings/02-positive_match-one-line-between/filecheck.check @@ -1,3 +1,3 @@ -; CHECK: hello1 -; CHECK: hello2 -; CHECK: hello3 +CHECK: hello1 +CHECK: hello2 +CHECK: hello3