Skip to content

CHECK-NOT: case when it is the last check but there is still some input #69

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 1 commit into from
Dec 20, 2019
Merged

CHECK-NOT: case when it is the last check but there is still some input #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 19 additions & 1 deletion filecheck/FileCheck.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ def __init__(self, failed_check):
self.failed_check = failed_check


class CheckNOTIsLastException(BaseException):
pass


class InputFinishedException(BaseException):
def __init__(self):
pass
Expand Down Expand Up @@ -390,7 +394,7 @@ def main():
current_check = next(check_iterator)
continue
except StopIteration:
exit(0)
raise CheckNOTIsLastException

elif check_result == CheckResult.FAIL_SKIP_LINE:
try:
Expand All @@ -417,6 +421,20 @@ def main():

current_check = still_actual_check
current_check_line_idx = line_idx
except CheckNOTIsLastException:
# Here we catch the case when the last check is known to be CHECK-NOT.
# We have to iterate over the remaining input lines and check them all
# against this last check.
try:
while True:
line_idx, line = next(stdin_input_iter)
input_lines.append(line)
if check_line(line, current_check, args.match_full_lines) == \
CheckResult.CHECK_NOT_MATCH:
current_check_line_idx = line_idx
break
except StopIteration:
exit(0)

except CheckFailedException as e:
current_check = e.failed_check.check
Expand Down
1 change: 1 addition & 0 deletions ...multiple_strings/02-CHECK-NOT-is-the-last-check-and-multiple-to-check-yet/filecheck.check
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
; CHECK-NOT:String5
5 changes: 5 additions & 0 deletions ...multiple_strings/02-CHECK-NOT-is-the-last-check-and-multiple-to-check-yet/filecheck.input
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
String1
String2
String3
String4
String5
9 changes: 9 additions & 0 deletions ...OT/multiple_strings/02-CHECK-NOT-is-the-last-check-and-multiple-to-check-yet/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:String5
; CHECK: ^
; CHECK:<stdin>:5:1: note: found here
; CHECK:String5
; CHECK:^~~~~~~
; CHECK-EMPTY: