Skip to content

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

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 4 commits into from
Dec 5, 2021
Merged

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

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
55480af
Code climate: fix next batch of "; " occurences
stanislaw Dec 5, 2021
48969f4
Code climate: fix next batch of "; " occurences
stanislaw Dec 5, 2021
c361cd2
Code climate: fix next batch of "; " occurences
stanislaw Dec 5, 2021
f3fce93
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
Prev Previous commit
Next Next commit
Code climate: fix next batch of "; " occurences
  • Loading branch information
@stanislaw
stanislaw committed Dec 5, 2021
commit 48969f49c4e5a47b3f0eec42ab52debf488e82c2
26 changes: 13 additions & 13 deletions tests/integration/tests/options/--help/sample.itest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
; RUN: %expect_exit 0 %FILECHECK_EXEC --help | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines
RUN: %expect_exit 0 %FILECHECK_EXEC --help | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines

; CHECK:{{^USAGE: [Ff]ile[Cc]heck.* \[options\] <check-file>$}}
; CHECK-EMPTY:
; CHECK-NEXT:OPTIONS:
; CHECK-EMPTY:
CHECK:{{^USAGE: [Ff]ile[Cc]heck.* \[options\] <check-file>$}}
CHECK-EMPTY:
CHECK-NEXT:OPTIONS:
CHECK-EMPTY:

; FileCheck C++ prints options without -- but with - only.
; FileCheck.py is made consistent so below we use regex matches to accomodate
; for both - and -- versions.
; CHECK:General options:
; CHECK-EMPTY:
; CHECK:{{^ --?match-full-lines - Require all positive matches to cover an entire input line.$}}
; CHECK-NEXT:{{^ ?Allows leading and trailing whitespace if --strict-whitespace$}}
; CHECK-NEXT:{{^ ?is not also passed.$}}
; CHECK-NEXT:{{^ --?strict-whitespace - Do not treat all horizontal whitespace as equivalent$}}
CHECK:General options:
CHECK-EMPTY:
CHECK:{{^ --?match-full-lines - Require all positive matches to cover an entire input line.$}}
CHECK-NEXT:{{^ ?Allows leading and trailing whitespace if --strict-whitespace$}}
CHECK-NEXT:{{^ ?is not also passed.$}}
CHECK-NEXT:{{^ --?strict-whitespace - Do not treat all horizontal whitespace as equivalent$}}

; CHECK:{{Generic [Oo]ptions:}}
; CHECK-EMPTY:
CHECK:{{Generic [Oo]ptions:}}
CHECK-EMPTY:
2 changes: 1 addition & 1 deletion ...ration/tests/options/--implicit-check-not/01_basic_implicit_check_not_hit/filecheck.check
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
; CHECK: string 1
CHECK: string 1
14 changes: 7 additions & 7 deletions ...tegration/tests/options/--implicit-check-not/01_basic_implicit_check_not_hit/sample.itest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
; RUN: %cat "%S/filecheck.input" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" --implicit-check-not error | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines
RUN: %cat "%S/filecheck.input" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" --implicit-check-not error | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines

; CHECK:command line:1:22: error: CHECK-NOT: excluded string found in input
; CHECK:-implicit-check-not='error'
; CHECK: ^
; CHECK:<stdin>:1:1: note: found here
; CHECK:error
; CHECK:^~~~~
CHECK:command line:1:22: error: CHECK-NOT: excluded string found in input
CHECK:-implicit-check-not='error'
CHECK: ^
CHECK:<stdin>:1:1: note: found here
CHECK:error
CHECK:^~~~~
2 changes: 1 addition & 1 deletion ...icit-check-not/02_implicit_check_not_has_lower_priority_than_normal_check/filecheck.check
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
; CHECK: string 1
CHECK: string 1
14 changes: 7 additions & 7 deletions ...mplicit-check-not/02_implicit_check_not_has_lower_priority_than_normal_check/sample.itest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
; RUN: %cat "%S/filecheck.input" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" --implicit-check-not error | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines
RUN: %cat "%S/filecheck.input" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" --implicit-check-not error | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines

; CHECK:{{^.*}}filecheck.check:1:10: error: CHECK: expected string not found in input
; CHECK:; CHECK: string 1
; CHECK: ^
; CHECK:<stdin>:1:1: note: scanning from here
; CHECK:error
; CHECK:^
CHECK:{{^.*}}filecheck.check:1:8: error: CHECK: expected string not found in input
CHECK:CHECK: string 1
CHECK: ^
CHECK:<stdin>:1:1: note: scanning from here
CHECK:error
CHECK:^
4 changes: 2 additions & 2 deletions ...not/03_implicit_check_not_has_higher_priority_than_normal_check_not_check/filecheck.check
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
; CHECK-NOT: error
; CHECK: string 1
CHECK-NOT: error
CHECK: string 1
14 changes: 7 additions & 7 deletions ...ck-not/03_implicit_check_not_has_higher_priority_than_normal_check_not_check/sample.itest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
; RUN: %cat "%S/filecheck.input" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" --implicit-check-not error | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines
RUN: %cat "%S/filecheck.input" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" --implicit-check-not error | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines

; CHECK:command line:1:22: error: CHECK-NOT: excluded string found in input
; CHECK:-implicit-check-not='error'
; CHECK: ^
; CHECK:<stdin>:1:1: note: found here
; CHECK:error
; CHECK:^~~~~
CHECK:command line:1:22: error: CHECK-NOT: excluded string found in input
CHECK:-implicit-check-not='error'
CHECK: ^
CHECK:<stdin>:1:1: note: found here
CHECK:error
CHECK:^~~~~
2 changes: 1 addition & 1 deletion ...n/tests/options/--implicit-check-not/04_implicit_check_not_match_behavior/filecheck.check
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
; CHECK:Foo
CHECK:Foo
28 changes: 14 additions & 14 deletions ...tion/tests/options/--implicit-check-not/04_implicit_check_not_match_behavior/sample.itest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
; RUN: %printf "someerrorsome\nFoo" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" --implicit-check-not "error" | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines --check-prefix CHECK-BEFORE
RUN: %printf "someerrorsome\nFoo" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" --implicit-check-not "error" | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines --check-prefix CHECK-BEFORE

; CHECK-BEFORE:command line:1:22: error: CHECK-NOT: excluded string found in input
; CHECK-BEFORE:-implicit-check-not='error'
; CHECK-BEFORE: ^
; CHECK-BEFORE:<stdin>:1:5: note: found here
; CHECK-BEFORE:someerrorsome
; CHECK-BEFORE: ^~~~~
CHECK-BEFORE:command line:1:22: error: CHECK-NOT: excluded string found in input
CHECK-BEFORE:-implicit-check-not='error'
CHECK-BEFORE: ^
CHECK-BEFORE:<stdin>:1:5: note: found here
CHECK-BEFORE:someerrorsome
CHECK-BEFORE: ^~~~~

; RUN: %printf "Foo\nsomeerrorsome" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" --implicit-check-not "error" | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines --check-prefix CHECK-AFTER
RUN: %printf "Foo\nsomeerrorsome" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" --implicit-check-not "error" | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines --check-prefix CHECK-AFTER

; CHECK-AFTER:command line:1:22: error: CHECK-NOT: excluded string found in input
; CHECK-AFTER:-implicit-check-not='error'
; CHECK-AFTER: ^
; CHECK-AFTER:<stdin>:2:5: note: found here
; CHECK-AFTER:someerrorsome
; CHECK-AFTER: ^~~~~
CHECK-AFTER:command line:1:22: error: CHECK-NOT: excluded string found in input
CHECK-AFTER:-implicit-check-not='error'
CHECK-AFTER: ^
CHECK-AFTER:<stdin>:2:5: note: found here
CHECK-AFTER:someerrorsome
CHECK-AFTER: ^~~~~

2 changes: 1 addition & 1 deletion ...ions/--implicit-check-not/05_implicit_check_not_extra_whitespace_behavior/filecheck.check
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
; CHECK:Foo
CHECK:Foo
36 changes: 18 additions & 18 deletions ...options/--implicit-check-not/05_implicit_check_not_extra_whitespace_behavior/sample.itest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
; RUN: %printf "error\nFoo" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check" --implicit-check-not " error "
; RUN: %printf "error\nFoo" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check" --implicit-check-not " error " --strict-whitespace
; RUN: %printf "error\nFoo" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check" --implicit-check-not " error " --match-full-lines
; RUN: %printf "error\nFoo" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check" --implicit-check-not " error " --strict-whitespace --match-full-lines
RUN: %printf "error\nFoo" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check" --implicit-check-not " error "
RUN: %printf "error\nFoo" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check" --implicit-check-not " error " --strict-whitespace
RUN: %printf "error\nFoo" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check" --implicit-check-not " error " --match-full-lines
RUN: %printf "error\nFoo" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check" --implicit-check-not " error " --strict-whitespace --match-full-lines

; RUN: %printf "error \nFoo" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check" --implicit-check-not " error "
; RUN: %printf "error \nFoo" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check" --implicit-check-not " error " --strict-whitespace
; RUN: %printf "error \nFoo" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check" --implicit-check-not " error " --match-full-lines
; RUN: %printf "error \nFoo" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check" --implicit-check-not " error " --strict-whitespace --match-full-lines
RUN: %printf "error \nFoo" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check" --implicit-check-not " error "
RUN: %printf "error \nFoo" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check" --implicit-check-not " error " --strict-whitespace
RUN: %printf "error \nFoo" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check" --implicit-check-not " error " --match-full-lines
RUN: %printf "error \nFoo" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check" --implicit-check-not " error " --strict-whitespace --match-full-lines

; RUN: %printf " error\nFoo" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" --implicit-check-not " error " | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines
; RUN: %printf " error\nFoo" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" --implicit-check-not " error " --strict-whitespace | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines
; RUN: %printf " error\nFoo" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" --implicit-check-not " error " --match-full-lines | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines
; RUN: %printf " error\nFoo" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check" --implicit-check-not " error " --strict-whitespace --match-full-lines
RUN: %printf " error\nFoo" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" --implicit-check-not " error " | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines
RUN: %printf " error\nFoo" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" --implicit-check-not " error " --strict-whitespace | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines
RUN: %printf " error\nFoo" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" --implicit-check-not " error " --match-full-lines | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines
RUN: %printf " error\nFoo" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check" --implicit-check-not " error " --strict-whitespace --match-full-lines

; CHECK:command line:1:22: error: CHECK-NOT: excluded string found in input
; CHECK:-implicit-check-not=' error '
; CHECK: ^
; CHECK:<stdin>:1:1: note: found here
; CHECK: error
; CHECK:^~~~~~
CHECK:command line:1:22: error: CHECK-NOT: excluded string found in input
CHECK:-implicit-check-not=' error '
CHECK: ^
CHECK:<stdin>:1:1: note: found here
CHECK: error
CHECK:^~~~~~