Skip to content

CHECK: regex lines: match full lines when strict mode is enabled #155

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
Jun 8, 2021
Merged

CHECK: regex lines: match full lines when strict mode is enabled #155

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
11 changes: 8 additions & 3 deletions filecheck/FileCheck.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ def exit_handler(code):
line = canonicalize_whitespace(line)

# CHECK and CHECK-NEXT
strict_whitespace_match = "" if args.strict_whitespace and args.match_full_lines else " *"
strict_whitespace_match = "" if strict_mode else " *"

check_regex = "{}({}):{}(.*)".format(before_prefix, check_prefix, strict_whitespace_match)
check_match = re.search(check_regex, line)
Expand All @@ -296,7 +296,7 @@ def exit_handler(code):
if check_match:
check_keyword = check_match.group(2)
check_expression = check_match.group(3)
if not (args.strict_whitespace and args.match_full_lines):
if not strict_mode:
check_expression = check_expression.strip(' ')

match_type = MatchType.SUBSTRING
Expand All @@ -306,6 +306,11 @@ def exit_handler(code):
regex_line = re.sub(r"\{\{(.*?)\}\}", r"\1", regex_line)
match_type = MatchType.REGEX
check_expression = regex_line
if strict_mode:
if check_expression[0] != "^":
check_expression = "^" + check_expression
if check_expression[-1] != "$":
check_expression = check_expression + "$"

check = Check(check_type=check_type,
match_type=match_type,
Expand All @@ -325,7 +330,7 @@ def exit_handler(code):

check_keyword = check_match.group(2)
check_expression = check_match.group(3)
if not (args.strict_whitespace and args.match_full_lines):
if not strict_mode:
check_expression = check_expression.strip(' ')

if re.search(r"\{\{.*\}\}", check_expression):
Expand Down
1 change: 1 addition & 0 deletions ...hen_strict_whitespace_is_also_specified/03_negative_regex_substring_begin/filecheck.check
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
CHECK:Substring2{{.*}}Substring3
1 change: 1 addition & 0 deletions ...hen_strict_whitespace_is_also_specified/03_negative_regex_substring_begin/filecheck.input
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Substring1 Substring2 Substring3
7 changes: 7 additions & 0 deletions ...2_when_strict_whitespace_is_also_specified/03_negative_regex_substring_begin/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" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" --match-full-lines --strict-whitespace
CHECK:{{.*}}filecheck.check:1:7: error: CHECK: expected string not found in input
CHECK:CHECK:Substring2{{.*}}Substring3
CHECK: ^
CHECK:<stdin>:1:1: note: scanning from here
CHECK:Substring1 Substring2 Substring3
CHECK:^
1 change: 1 addition & 0 deletions ..._when_strict_whitespace_is_also_specified/04_negative_regex_substring_end/filecheck.check
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
CHECK:Substring1{{.*}}Substring2
1 change: 1 addition & 0 deletions ..._when_strict_whitespace_is_also_specified/04_negative_regex_substring_end/filecheck.input
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Substring1 Substring2 Substring3
7 changes: 7 additions & 0 deletions .../02_when_strict_whitespace_is_also_specified/04_negative_regex_substring_end/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" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" --match-full-lines --strict-whitespace
CHECK:{{.*}}filecheck.check:1:7: error: CHECK: expected string not found in input
CHECK:CHECK:Substring1{{.*}}Substring2
CHECK: ^
CHECK:<stdin>:1:1: note: scanning from here
CHECK:Substring1 Substring2 Substring3
CHECK:^