Skip to content

Self testing: fix one edge case and some tests to enable FileCheck.py to pass on more tests #146

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 4 commits into from
Jun 6, 2020
Merged

Self testing: fix one edge case and some tests to enable FileCheck.py to pass on more tests #146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b95c0fd
tasks: remove some redundancy
stanislaw Jun 6, 2020
d992354
tasks: introduce task for testing FileCheck.py using FileCheck.py
stanislaw Jun 6, 2020
d866cd3
tests: fix argument: -prefix -> --prefix
stanislaw Jun 6, 2020
38b79b3
Use non-greedy match when matching for CHECK: lines
stanislaw Jun 6, 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
4 changes: 2 additions & 2 deletions filecheck/FileCheck.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,11 +264,11 @@ def main():
# CHECK and CHECK-NEXT
strict_whitespace_match = "" if args.strict_whitespace and args.match_full_lines else " *"

check_regex = ".*({}):{}(.*)".format(check_prefix, strict_whitespace_match)
check_regex = ".*?({}):{}(.*)".format(check_prefix, strict_whitespace_match)
check_match = re.search(check_regex, line)
check_type = CheckType.CHECK
if not check_match:
check_regex = ".*({}-NEXT):{}(.*)".format(check_prefix, strict_whitespace_match)
check_regex = ".*?({}-NEXT):{}(.*)".format(check_prefix, strict_whitespace_match)
check_match = re.search(check_regex, line)
check_type = CheckType.CHECK_NEXT

Expand Down
53 changes: 35 additions & 18 deletions tasks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,6 @@ def get_os_filename_string():
assert 0, "error: FileCheck.py could not detect OS"


def get_filecheck_py_exec():
cwd = os.getcwd()
return 'python \\"{cwd}/filecheck/FileCheck.py\\"'.format(cwd=cwd)


def get_filecheck_tester_exec():
cwd = os.getcwd()
os_string = get_os_filename_string()

template = '\\"{cwd}/tests/integration/tools/FileCheck/FileCheck-9.0.1-{os_string}\\"'
return template.format(cwd=cwd, os_string=os_string)


def get_filecheck_llvm_path(filecheck_exec):
cwd = os.getcwd()
os_string = get_os_filename_string()
Expand All @@ -41,19 +28,23 @@ def get_filecheck_llvm_path(filecheck_exec):
)


def get_filecheck_py_exec():
cwd = os.getcwd()
return 'python \\"{cwd}/filecheck/FileCheck.py\\"'.format(cwd=cwd)


def formatted_command(string):
return re.sub('\\s+', ' ', string).strip()


def run_lit_tests(c, filecheck_exec, llvm_only):
def run_lit_tests(c, filecheck_exec, filecheck_tester_exec, llvm_only):
assert c
assert filecheck_exec
assert llvm_only is not None

cwd = os.getcwd()

llvm_only_value = "1" if llvm_only else ""
filecheck_tester_exec = get_filecheck_tester_exec()

command = formatted_command("""
lit
Expand All @@ -71,11 +62,37 @@ def run_lit_tests(c, filecheck_exec, llvm_only):
c.run("{}".format(command))


@task
def test_filecheck_llvm(c):
filecheck_llvm_8_exec = get_filecheck_llvm_path(FILECHECK_LLVM_8_EXEC)
filecheck_llvm_9_exec = get_filecheck_llvm_path(FILECHECK_LLVM_9_EXEC)
filecheck_tester_exec = get_filecheck_llvm_path(FILECHECK_LLVM_9_EXEC)

run_lit_tests(c, filecheck_llvm_8_exec, filecheck_tester_exec, True)
run_lit_tests(c, filecheck_llvm_9_exec, filecheck_tester_exec, True)


@task
def test_filecheck_py_using_file_check_llvm_tester(c):
filecheck_exec = get_filecheck_py_exec()
filecheck_tester_exec = get_filecheck_llvm_path(FILECHECK_LLVM_9_EXEC)

run_lit_tests(c, filecheck_exec, filecheck_tester_exec, False)


@task
def test_filecheck_py_using_filecheck_py_tester(c):
filecheck_exec = get_filecheck_py_exec()
filecheck_tester_exec = filecheck_exec

run_lit_tests(c, filecheck_exec, filecheck_tester_exec, False)


@task
def test(c):
run_lit_tests(c, get_filecheck_llvm_path(FILECHECK_LLVM_8_EXEC), True)
run_lit_tests(c, get_filecheck_llvm_path(FILECHECK_LLVM_9_EXEC), True)
run_lit_tests(c, get_filecheck_py_exec(), False)
test_filecheck_llvm(c)
test_filecheck_py_using_file_check_llvm_tester(c)


@task
def clean(c):
Expand Down
1 change: 1 addition & 0 deletions ...commands/CHECK/one_string/positive-match/05-CHECK-two-times-matches-first/filecheck.check
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
; CHECK:{{^.*filecheck.check:1:(9|10): error: CHECK: expected string not found in input$}}
1 change: 1 addition & 0 deletions ...commands/CHECK/one_string/positive-match/05-CHECK-two-times-matches-first/filecheck.input
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
A-very-long-path/filecheck.check:1:9: error: CHECK: expected string not found in input
1 change: 1 addition & 0 deletions ...ck_commands/CHECK/one_string/positive-match/05-CHECK-two-times-matches-first/sample.itest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
; RUN: %cat "%S/filecheck.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check"
2 changes: 2 additions & 0 deletions ...ests/check_commands/CHECK/two_strings/04-wip-negative_match_second_string/filecheck.check
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
; CHECK: hello1
; CHECK: foo
2 changes: 2 additions & 0 deletions ...ests/check_commands/CHECK/two_strings/04-wip-negative_match_second_string/filecheck.input
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
hello1
hello2
12 changes: 12 additions & 0 deletions ...n/tests/check_commands/CHECK/two_strings/04-wip-negative_match_second_string/sample.itest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
; RUN: %cat "%S/filecheck.input" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" | %FILECHECK_TESTER_EXEC "%s" --match-full-lines

; CHECK: {{.*filecheck.check:2:10: error: CHECK: expected string not found in input$}}
; CHECK: {{^}}; CHECK: foo{{$}}
; CHECK: {{^}} ^{{$}}
; CHECK: {{^<stdin>:.*:.*: note: scanning from here$}}
; CHECK: hello2
; CHECK: ^{{$}}
; CHECK: {{^<stdin>:.*:.*: note: possible intended match here$}}
; CHECK: hello2
; CHECK: ^
; CHECK-EMPTY:
2 changes: 1 addition & 1 deletion ...h-full-lines/CHECK/01_matching_substring_is_rejected_when_full_match_enabled/sample.itest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
; RUN: %cat "%S/filecheck.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check"
; RUN: %cat "%S/filecheck.input" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" --match-full-lines | %FILECHECK_TESTER_EXEC "%s" --match-full-lines --strict-whitespace -check-prefix=OPTION
; RUN: %cat "%S/filecheck.input" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" --match-full-lines | %FILECHECK_TESTER_EXEC "%s" --match-full-lines --strict-whitespace --check-prefix=OPTION

; OPTION:{{^.*}}filecheck.check:1:10: error: CHECK: expected string not found in input{{$}}
; OPTION:; CHECK: hello world
Expand Down
2 changes: 1 addition & 1 deletion ...n/tests/options/--strict-whitespace/CHECK/01_input_has_mixed_spaces_and_tabs/sample.itest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
; RUN: %cat "%S/filecheck.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check"
; RUN: %cat "%S/filecheck.input" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" --strict-whitespace | %FILECHECK_TESTER_EXEC "%s" --match-full-lines -check-prefix=OPTION
; RUN: %cat "%S/filecheck.input" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" --strict-whitespace | %FILECHECK_TESTER_EXEC "%s" --match-full-lines --check-prefix=OPTION

; OPTION: {{^.*}}filecheck.check:1:10: error: CHECK: expected string not found in input{{$}}
; OPTION: ; CHECK: hello world hello world
Expand Down
2 changes: 1 addition & 1 deletion ...n/tests/options/--strict-whitespace/CHECK/02_check_has_mixed_spaces_and_tabs/sample.itest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
; RUN: %cat "%S/filecheck.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check"
; RUN: %cat "%S/filecheck.input" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" --strict-whitespace | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines -check-prefix=OPTION
; RUN: %cat "%S/filecheck.input" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" --strict-whitespace | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines --check-prefix=OPTION

; OPTION:{{^.*}}filecheck.check:1:10: error: CHECK: expected string not found in input{{$}}
; OPTION:; CHECK: hello world hello world
Expand Down
2 changes: 1 addition & 1 deletion ...sts/options/--strict-whitespace/CHECK_NOT/01_input_has_mixed_spaces_and_tabs/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 1 %FILECHECK_EXEC "%S/filecheck.check" | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines -check-prefix=NO_OPTION
; RUN: %cat "%S/filecheck.input" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines --check-prefix=NO_OPTION
; RUN: %cat "%S/filecheck.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check" --strict-whitespace

; NO_OPTION:{{^.*}}filecheck.check:1:14: error: CHECK-NOT: excluded string found in input{{$}}
Expand Down
2 changes: 1 addition & 1 deletion ...sts/options/--strict-whitespace/CHECK_NOT/02_check_has_mixed_spaces_and_tabs/sample.itest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
; RUN: %cat "%S/filecheck.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check"
; RUN: %cat "%S/filecheck.input" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" --strict-whitespace | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines -check-prefix=OPTION
; RUN: %cat "%S/filecheck.input" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" --strict-whitespace | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines --check-prefix=OPTION

; OPTION:{{^.*}}filecheck.check:1:10: error: CHECK: expected string not found in input{{$}}
; OPTION:; CHECK: hello world hello world
Expand Down