Skip to content

Code climate: fix next batch of "; " occurences #177

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 5, 2021
Merged

Code climate: fix next batch of "; " occurences #177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d991830
Code climate: convert one test to --strict-whitespace
stanislaw Dec 5, 2021
95a888c
Code climate: fix next batch of "; " occurences
stanislaw Dec 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...ests/check_commands/CHECK-NOT/one_string/negative/03-negative_match_regex/filecheck.check
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
; CHECK-NOT: {{^h.l.o$}}
CHECK-NOT: {{^h.l.o$}}
16 changes: 8 additions & 8 deletions ...n/tests/check_commands/CHECK-NOT/one_string/negative/03-negative_match_regex/sample.itest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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: {{^<stdin>:.*:.*: note: found here$}}
; CHECK-NEXT: {{^}}hello{{$}}
; CHECK-NEXT: {{^}}^~~~~{{$}}
; CHECK-EMPTY:
CHECK-NEXT: ^
CHECK-NEXT:{{^<stdin>:.*:.*: note: found here$}}
CHECK-NEXT:hello
CHECK-NEXT:^~~~~
CHECK-EMPTY:
2 changes: 1 addition & 1 deletion ...-NOT/one_string/negative/04-negative-match-regex-escaping_non_regex_parts/filecheck.check
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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{{$}}
16 changes: 8 additions & 8 deletions ...ECK-NOT/one_string/negative/04-negative-match-regex-escaping_non_regex_parts/sample.itest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:{{^<stdin>: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:{{^<stdin>:1:1: note: found here$}}
CHECK-NEXT:{{^}}The following braces must be escaped by FileCheck: ( inside braces ): 0/1{{$}}
CHECK-NEXT:{{^}}^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{{$}}
CHECK-EMPTY:
2 changes: 1 addition & 1 deletion ...tion/tests/check_commands/CHECK-NOT/one_string/positive/01-positive_match/filecheck.check
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
; CHECK-NOT: hello
CHECK-NOT: hello
2 changes: 1 addition & 1 deletion ...gration/tests/check_commands/CHECK-NOT/one_string/positive/01-positive_match/sample.itest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
8 changes: 4 additions & 4 deletions ...ring/positive/02-positive_check_effective_only_one_line_before_next_check/filecheck.check
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
; CHECK: string1
; CHECK-NOT: hello
; CHECK: string2
; CHECK: string3
CHECK: string1
CHECK-NOT: hello
CHECK: string2
CHECK: string3
2 changes: 1 addition & 1 deletion ..._string/positive/02-positive_check_effective_only_one_line_before_next_check/sample.itest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
2 changes: 1 addition & 1 deletion ...ests/check_commands/CHECK-NOT/one_string/positive/03-positive_match_regex/filecheck.check
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
; CHECK-NOT: {{hello}}
CHECK-NOT: {{hello}}
2 changes: 1 addition & 1 deletion ...many_strings/01-negative-match-of-string-between-many-placeholder-strings/filecheck.check
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
; CHECK:{{STRINGGG}}
CHECK:{{STRINGGG}}
29 changes: 15 additions & 14 deletions ...CK/many_strings/01-negative-match-of-string-between-many-placeholder-strings/sample.itest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:<stdin>: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:<stdin>: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:<stdin>: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:<stdin>:5:{{(1|4)}}: note: possible intended match here
CHECK-NEXT:STRING
CHECK-NEXT:{{^.*\^$}}
CHECK-EMPTY:
2 changes: 1 addition & 1 deletion ...on/tests/check_commands/CHECK/one_string/negative-match/01-negative_match/filecheck.check
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
; CHECK: foo
CHECK: foo
22 changes: 11 additions & 11 deletions ...ation/tests/check_commands/CHECK/one_string/negative-match/01-negative_match/sample.itest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:<stdin>:1:1: note: scanning from here
; CHECK:hello
; CHECK:^
; CHECK:<stdin>: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:<stdin>:1:1: note: scanning from here
CHECK:hello
CHECK:^
CHECK:<stdin>:1:3: note: possible intended match here
CHECK:hello
CHECK: ^
CHECK-EMPTY
2 changes: 1 addition & 1 deletion ...ts/check_commands/CHECK/one_string/negative-match/02-negative_regex_match/filecheck.check
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
; CHECK: {{^}}hello{{$}}
CHECK: {{^}}hello{{$}}
16 changes: 8 additions & 8 deletions ...tests/check_commands/CHECK/one_string/negative-match/02-negative_regex_match/sample.itest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:<stdin>: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:<stdin>:1:1: note: scanning from here
CHECK-NEXT:h e llo
CHECK-NEXT:^
CHECK-EMPTY:
2 changes: 1 addition & 1 deletion ...CK/one_string/negative-match/03-negative_regex_match_spaces_before_string/filecheck.check
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
; CHECK: {{^}}hello{{$}}
CHECK: {{^}}hello{{$}}
23 changes: 12 additions & 11 deletions ...CHECK/one_string/negative-match/03-negative_regex_match_spaces_before_string/sample.itest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:{{^<stdin>: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:{{^<stdin>:1:(1|2): note: scanning from here$}}
CHECK-NEXT:{{^ ( )?h e llo$}}
CHECK-NEXT:{{^ ?\^$}}
CHECK-EMPTY:
16 changes: 8 additions & 8 deletions ...nds/CHECK/one_string/negative-match/04-negative_match_no_input_lines_anymore/sample.itest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:<stdin>: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:<stdin>:1:8: note: scanning from here
CHECK:String1
CHECK: ^
CHECK-EMPTY:
2 changes: 1 addition & 1 deletion ...on/tests/check_commands/CHECK/one_string/positive-match/01-positive_match/filecheck.check
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
; CHECK: hello
CHECK: hello
2 changes: 1 addition & 1 deletion ...ck_commands/CHECK/one_string/positive-match/02-positive_match_whitespaces/filecheck.check
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
; CHECK: three different words
CHECK: three different words
2 changes: 1 addition & 1 deletion ...ts/check_commands/CHECK/one_string/positive-match/03-positive_regex_match/filecheck.check
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
; CHECK: {{^}}hello{{$}}
CHECK: {{^}}hello{{$}}
2 changes: 1 addition & 1 deletion ...heck_commands/CHECK/one_string/positive-match/04-escaping_non_regex_parts/filecheck.check
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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{{$}}
6 changes: 3 additions & 3 deletions tests/integration/tests/check_commands/CHECK/three_strings/01-positive_match/filecheck.check
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
; CHECK: hello1
; CHECK: hello2
; CHECK: hello3
CHECK: hello1
CHECK: hello2
CHECK: hello3
6 changes: 3 additions & 3 deletions ...sts/check_commands/CHECK/three_strings/02-positive_match-one-line-between/filecheck.check
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
; CHECK: hello1
; CHECK: hello2
; CHECK: hello3
CHECK: hello1
CHECK: hello2
CHECK: hello3