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
Next Next commit
Code climate: fix next batch of "; " occurences
  • Loading branch information
@stanislaw
stanislaw committed Dec 5, 2021
commit 55480af99f4176cfe0aeb1e72e64f02477c7f0b3
4 changes: 2 additions & 2 deletions tests/integration/tests/check_commands/CHECK/two_strings/01-positive_match/filecheck.check
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
; CHECK: hello1
; CHECK: hello2
CHECK: hello1
CHECK: hello2
4 changes: 2 additions & 2 deletions ...tests/check_commands/CHECK/two_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,2 +1,2 @@
; CHECK: hello1
; CHECK: hello2
CHECK: hello1
CHECK: hello2
2 changes: 1 addition & 1 deletion tests/integration/tests/examples/hello-world/hello-world-regex.check
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
; CHECK: {{^Hello world$}}
CHECK: {{^Hello world$}}
2 changes: 1 addition & 1 deletion tests/integration/tests/examples/hello-world/hello-world.check
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
; CHECK: Hello world
CHECK: Hello world

4 changes: 2 additions & 2 deletions tests/integration/tests/examples/lit-and-filecheck/01-pass.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
; RUN: gcc "%s" -o %S/hello-world-1 && %S/hello-world-1 | %FILECHECK_EXEC %s
; CHECK: Hello world
RUN: gcc "%s" -o %S/hello-world-1 && %S/hello-world-1 | %FILECHECK_EXEC %s
CHECK: Hello world
*/

#include <stdio.h>
Expand Down
4 changes: 2 additions & 2 deletions tests/integration/tests/examples/lit-and-filecheck/02-fail.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
; RUN: gcc "%s" -o %S/hello-world-2 && %S/hello-world-2 | %FILECHECK_EXEC %s; test $? = 1
; CHECK: Wrong line
RUN: gcc "%s" -o %S/hello-world-2 && %S/hello-world-2 | %FILECHECK_EXEC %s; test $? = 1
CHECK: Wrong line
*/

#include <stdio.h>
Expand Down
8 changes: 4 additions & 4 deletions tests/integration/tests/examples/options/--check-prefix/--check-prefix.itest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
; RUN: printf "String1" | %FILECHECK_EXEC "%s" --check-prefix STRING1
; RUN: printf "String2" | %FILECHECK_EXEC "%s" --check-prefix STRING2
; STRING1: String1
; STRING2: String2
RUN: printf "String1" | %FILECHECK_EXEC "%s" --check-prefix STRING1
RUN: printf "String2" | %FILECHECK_EXEC "%s" --check-prefix STRING2
STRING1: String1
STRING2: String2
4 changes: 2 additions & 2 deletions tests/integration/tests/invalid_input/01_empty_invocation/sample.itest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
; RUN: %expect_exit 2 %FILECHECK_EXEC | %FILECHECK_TESTER_EXEC "%s" --match-full-lines
RUN: %expect_exit 2 %FILECHECK_EXEC | %FILECHECK_TESTER_EXEC "%s" --match-full-lines

; CHECK: <check-file> not specified
CHECK: <check-file> not specified
6 changes: 3 additions & 3 deletions tests/integration/tests/invalid_input/02_check_file_does_not_exist/sample.itest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
; RUN: %expect_exit 2 %FILECHECK_EXEC "file/does/not/exist" | %FILECHECK_TESTER_EXEC "%s" --match-full-lines
RUN: %expect_exit 2 %FILECHECK_EXEC "file/does/not/exist" | %FILECHECK_TESTER_EXEC "%s" --match-full-lines

; CHECK: Could not open check file 'file/does/not/exist': No such file or directory
; CHECK-EMPTY:
CHECK: Could not open check file 'file/does/not/exist': No such file or directory
CHECK-EMPTY:
6 changes: 3 additions & 3 deletions tests/integration/tests/invalid_input/03_empty_check_file/sample.itest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
; RUN: %printf "" | %expect_exit 2 %FILECHECK_EXEC "%S/filecheck.check" | %FILECHECK_TESTER_EXEC "%s" --match-full-lines
RUN: %printf "" | %expect_exit 2 %FILECHECK_EXEC "%S/filecheck.check" | %FILECHECK_TESTER_EXEC "%s" --match-full-lines

; CHECK: error: no check strings found with prefix 'CHECK:'
; CHECK-EMPTY
CHECK: error: no check strings found with prefix 'CHECK:'
CHECK-EMPTY
6 changes: 3 additions & 3 deletions tests/integration/tests/invalid_input/04_nonempty_check_file_but_no_checks/sample.itest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
; RUN: %printf "" | %expect_exit 2 %FILECHECK_EXEC "%S/filecheck.check" | %FILECHECK_TESTER_EXEC "%s" --match-full-lines
RUN: %printf "" | %expect_exit 2 %FILECHECK_EXEC "%S/filecheck.check" | %FILECHECK_TESTER_EXEC "%s" --match-full-lines

; CHECK: error: no check strings found with prefix 'CHECK:'
; CHECK-EMPTY
CHECK: error: no check strings found with prefix 'CHECK:'
CHECK-EMPTY
2 changes: 1 addition & 1 deletion tests/integration/tests/invalid_input/05_one_newline_symbol_input/filecheck.check
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
; CHECK-NOT: {{.+}}
CHECK-NOT: {{.+}}
2 changes: 1 addition & 1 deletion tests/integration/tests/invalid_input/06_empty_input_file/filecheck.check
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
; CHECK-NOT: {{.+}}
CHECK-NOT: {{.+}}
6 changes: 3 additions & 3 deletions tests/integration/tests/invalid_input/06_empty_input_file/sample.itest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
; RUN: %cat "%S/filecheck.input" | %expect_exit 2 %FILECHECK_EXEC "%S/filecheck.check" | %FILECHECK_TESTER_EXEC "%s"
RUN: %cat "%S/filecheck.input" | %expect_exit 2 %FILECHECK_EXEC "%S/filecheck.check" | %FILECHECK_TESTER_EXEC "%s"

; CHECK: FileCheck error: '-' is empty.
; CHECK: FileCheck command line: {{.*}}.check{{$}}
CHECK: FileCheck error: '-' is empty.
CHECK: FileCheck command line: {{.*}}.check{{$}}
6 changes: 3 additions & 3 deletions tests/integration/tests/options/--check-prefix/01_positive/sample.itest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
; RUN: %cat "%S/filecheck.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check" --check-prefix STRING1
; RUN: %cat "%S/filecheck.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check" --check-prefix STRING2
; RUN: %cat "%S/filecheck.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check" --check-prefix STRING3
RUN: %cat "%S/filecheck.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check" --check-prefix STRING1
RUN: %cat "%S/filecheck.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check" --check-prefix STRING2
RUN: %cat "%S/filecheck.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check" --check-prefix STRING3
6 changes: 3 additions & 3 deletions tests/integration/tests/options/--check-prefix/02_negative/sample.itest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
; RUN: %cat "%S/filecheck.input" | %expect_exit 2 %FILECHECK_EXEC "%S/filecheck.check" --check-prefix FOO | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines
RUN: %cat "%S/filecheck.input" | %expect_exit 2 %FILECHECK_EXEC "%S/filecheck.check" --check-prefix FOO | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines

; CHECK:error: no check strings found with prefix 'FOO:'
; CHECK-EMPTY:
CHECK:error: no check strings found with prefix 'FOO:'
CHECK-EMPTY:
6 changes: 3 additions & 3 deletions tests/integration/tests/options/--check-prefix/03_malformed_prefix/sample.itest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
; RUN: %cat "%S/filecheck.input" | %expect_exit 2 %FILECHECK_EXEC "%S/filecheck.check" --check-prefix "GARBAGE1.23.4.2" | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines
RUN: %cat "%S/filecheck.input" | %expect_exit 2 %FILECHECK_EXEC "%S/filecheck.check" --check-prefix "GARBAGE1.23.4.2" | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines

; CHECK:Supplied check-prefix is invalid! Prefixes must be unique and start with a letter and contain only alphanumeric characters, hyphens and underscores
; CHECK-EMPTY:
CHECK:Supplied check-prefix is invalid! Prefixes must be unique and start with a letter and contain only alphanumeric characters, hyphens and underscores
CHECK-EMPTY:
8 changes: 4 additions & 4 deletions tests/integration/tests/options/--check-prefix/04_common_suffix/filecheck.check
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
; CHECK: string 1
; OTHER-CHECK: string 2
; ANOTHER-CHECK: string 3
; YET_ANOTHER-CHECK: string 4
CHECK: string 1
OTHER-CHECK: string 2
ANOTHER-CHECK: string 3
YET_ANOTHER-CHECK: string 4
12 changes: 6 additions & 6 deletions tests/integration/tests/options/--check-prefix/04_common_suffix/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.1.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check" --check-prefix CHECK
; RUN: %cat "%S/filecheck.2.input" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" --check-prefix CHECK
RUN: %cat "%S/filecheck.1.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check" --check-prefix CHECK
RUN: %cat "%S/filecheck.2.input" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" --check-prefix CHECK

; RUN: %cat "%S/filecheck.2.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check" --check-prefix OTHER-CHECK
; RUN: %cat "%S/filecheck.3.input" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" --check-prefix OTHER-CHECK
RUN: %cat "%S/filecheck.2.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check" --check-prefix OTHER-CHECK
RUN: %cat "%S/filecheck.3.input" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" --check-prefix OTHER-CHECK

; RUN: %cat "%S/filecheck.3.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check" --check-prefix ANOTHER-CHECK
; RUN: %cat "%S/filecheck.4.input" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" --check-prefix ANOTHER-CHECK
RUN: %cat "%S/filecheck.3.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check" --check-prefix ANOTHER-CHECK
RUN: %cat "%S/filecheck.4.input" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" --check-prefix ANOTHER-CHECK