Skip to content

CHECK-NOT: Fix edge case when CHECK_NOT strings get shadowed by each #104

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
stanislaw merged 2 commits into from
Mar 19, 2020
Merged

CHECK-NOT: Fix edge case when CHECK_NOT strings get shadowed by each #104

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
3c18300
CHECK-NOT: case when a few CHECK-NOT are the last
stanislaw Mar 19, 2020
f30eb2a
CHECK-NOT: Fix edge case when CHECK_NOT strings get shadowed by each …
stanislaw Mar 19, 2020
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
21 changes: 16 additions & 5 deletions filecheck/FileCheck.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,8 +361,8 @@ def main():
print("FileCheck command line: {}".format(check_file))
exit(2)

current_not_checks = []
try:
current_not_checks = []
failed_check = None

while True:
Expand Down Expand Up @@ -415,6 +415,9 @@ def main():
raise CheckFailedException(failed_check)

elif check_result == CheckResult.CHECK_NOT_WITHOUT_MATCH:
if failed_check:
raise CheckFailedException(failed_check)

try:
current_not_checks.append(current_check)
current_check = next(check_iterator)
Expand Down Expand Up @@ -454,10 +457,18 @@ def main():
try:
while True:
line_idx, line = next(stdin_input_iter)
if check_line(line, current_check, args.match_full_lines) == \
CheckResult.CHECK_NOT_MATCH:
current_check_line_idx = line_idx
break

for not_check in current_not_checks:
if check_line(line, not_check, args.match_full_lines) == \
CheckResult.CHECK_NOT_MATCH:
current_check_line_idx = line_idx
failed_check = FailedCheck(not_check, line_idx)
raise CheckFailedException(failed_check)

except CheckFailedException as e:
current_check = e.failed_check.check
current_check_line_idx = e.failed_check.line_idx

except StopIteration:
exit(0)

Expand Down
2 changes: 2 additions & 0 deletions ...commands/CHECK-NOT/multiple_strings/06-multiple-CHECK-NOT-all-have-effect/filecheck.check
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
; CHECK-NOT:warning
; CHECK-NOT:error
2 changes: 2 additions & 0 deletions ...commands/CHECK-NOT/multiple_strings/06-multiple-CHECK-NOT-all-have-effect/filecheck.input
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
not w a r n i n g string
warning
7 changes: 7 additions & 0 deletions ...ck_commands/CHECK-NOT/multiple_strings/06-multiple-CHECK-NOT-all-have-effect/sample.itest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
; RUN: cat %S/filecheck.input | (%FILECHECK_EXEC %S/filecheck.check 2>&1; test $? = 1;) | %FILECHECK_TESTER_EXEC %s --strict-whitespace --match-full-lines
; CHECK:{{^.*}}FileCheck{{(\.py)?$}}
; CHECK:; CHECK-NOT:warning
; CHECK: ^
; CHECK:<stdin>:2:1: note: found here
; CHECK:warning
; CHECK:^~~~~~~
2 changes: 2 additions & 0 deletions .../multiple_strings/07-multiple-CHECK-NOT-do-not-get-shadowed-by-each-other/filecheck.check
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
; CHECK-NOT:warning
; CHECK-NOT:error
1 change: 1 addition & 0 deletions .../multiple_strings/07-multiple-CHECK-NOT-do-not-get-shadowed-by-each-other/filecheck.input
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
warning
9 changes: 9 additions & 0 deletions ...NOT/multiple_strings/07-multiple-CHECK-NOT-do-not-get-shadowed-by-each-other/sample.itest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
; RUN: cat %S/filecheck.input | (%FILECHECK_EXEC %S/filecheck.check 2>&1; test $? = 1;) | %FILECHECK_TESTER_EXEC %s --strict-whitespace --match-full-lines
; CHECK:{{^.*}}FileCheck{{(\.py)?$}}
; 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: