From d0a2949b933228a6c8f58e72feed5f9ec03cb9fc Mon Sep 17 00:00:00 2001 From: Stanislav Pankevich Date: Sat, 30 Nov 2019 18:53:37 +0100 Subject: [PATCH] Add Poetry --- .gitignore | 5 +++++ Makefile | 2 +- src/FileCheck => filecheck/FileCheck.py | 0 poetry.lock | 14 ++++++++++++++ pyproject.toml | 19 +++++++++++++++++++ .../sample.itest | 2 +- .../sample.itest | 2 +- .../sample.itest | 2 +- .../sample.itest | 2 +- .../sample.itest | 2 +- .../negative/01-negative_match/sample.itest | 2 +- .../sample.itest | 2 +- .../03-negative_match_regex/sample.itest | 2 +- .../sample.itest | 2 +- .../positive/01-positive_match/sample.itest | 2 +- .../02-positive_match_regex/sample.itest | 2 +- .../01-negative_match/sample.itest | 2 +- .../02-negative_regex_match/sample.itest | 2 +- .../sample.itest | 2 +- .../01-positive_match/sample.itest | 2 +- .../sample.itest | 2 +- .../03-positive_regex_match/sample.itest | 2 +- .../04-escaping_non_regex_parts/sample.itest | 2 +- .../01-positive_match/sample.itest | 2 +- .../sample.itest | 2 +- .../sample.itest | 2 +- .../sample.itest | 2 +- .../sample.itest | 2 +- .../01-positive_match/sample.itest | 2 +- .../sample.itest | 2 +- .../sample.itest | 2 +- .../sample.itest | 2 +- .../01_empty_invocation/sample.itest | 2 +- .../02_check_file_does_not_exist/sample.itest | 2 +- .../03_empty_check_file/sample.itest | 2 +- .../sample.itest | 2 +- .../--check-prefix/01_positive/sample.itest | 2 +- .../--check-prefix/02_negative/sample.itest | 2 +- .../03_malformed_prefix/sample.itest | 2 +- .../01_option_has_no_effect/sample.itest | 2 +- .../sample.itest | 4 ++-- .../sample.itest | 4 ++-- .../01_string/sample.itest | 2 +- .../02_regex/sample.itest | 2 +- .../03_string_negative/sample.itest | 2 +- .../04_regex_negative/sample.itest | 2 +- .../sample.itest | 4 ++-- .../sample.itest | 4 ++-- .../sample.itest | 4 ++-- .../sample.itest | 4 ++-- .../FileCheck-manual/CHECK-EMPTY/sample.itest | 2 +- .../01-mull-scalar-operator-enum/sample.itest | 2 +- 52 files changed, 92 insertions(+), 54 deletions(-) create mode 100644 .gitignore rename src/FileCheck => filecheck/FileCheck.py (100%) create mode 100644 poetry.lock create mode 100644 pyproject.toml diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..959369e --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +.venv +__pycache__ +*.egg-info +dist + diff --git a/Makefile b/Makefile index 582ba64..4446841 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ test-lit: test-lit-real test-lit-py ## Run tests against both FileCheck C++ and @echo "Have run both real FileCheck C++ and FileCheck.py tests." endif -FILECHECK_PY_EXEC=$(PWD)/src/FileCheck +FILECHECK_PY_EXEC=$(PWD)/filecheck/FileCheck.py test-lit-py: ## Run tests against FileCheck.py. @echo "--- Running integration tests against FileCheck.py ---" cd tests/integration && make clean diff --git a/src/FileCheck b/filecheck/FileCheck.py similarity index 100% rename from src/FileCheck rename to filecheck/FileCheck.py diff --git a/poetry.lock b/poetry.lock new file mode 100644 index 0000000..44318b6 --- /dev/null +++ b/poetry.lock @@ -0,0 +1,14 @@ +[[package]] +category = "dev" +description = "A Software Testing Tool" +name = "lit" +optional = false +python-versions = "*" +version = "0.9.0" + +[metadata] +content-hash = "50f47cfff0a332393b8edae898b2a7e4efd01d4f306246d32bb98c52e8701baa" +python-versions = "^3.4" + +[metadata.hashes] +lit = ["c035aa0a233633f7046745164a153a57d8bbcaf9b833232438cf4d2923d8786e"] diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 0000000..82422db --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,19 @@ +[tool.poetry] +name = "filecheck" +version = "0.0.1" +description = "Python port of LLVM's FileCheck, flexible pattern matching file verifier" +authors = ["Stanislav Pankevich "] + +[tool.poetry.dependencies] +python = "^3.4" + +[tool.poetry.dev-dependencies] +lit = "^0.9" + +[tool.poetry.scripts] +filecheck = "filecheck.FileCheck:main" + +[build-system] +requires = ["poetry>=0.12"] +build-backend = "poetry.masonry.api" + diff --git a/tests/integration/tests/check_commands/CHECK-EMPTY/01-error_CHECK_EMPTY_without_previous_CHECK/sample.itest b/tests/integration/tests/check_commands/CHECK-EMPTY/01-error_CHECK_EMPTY_without_previous_CHECK/sample.itest index 2b93268..76c0ff1 100644 --- a/tests/integration/tests/check_commands/CHECK-EMPTY/01-error_CHECK_EMPTY_without_previous_CHECK/sample.itest +++ b/tests/integration/tests/check_commands/CHECK-EMPTY/01-error_CHECK_EMPTY_without_previous_CHECK/sample.itest @@ -1,5 +1,5 @@ ; RUN: cat %S/filecheck.input | (%FILECHECK_EXEC %S/filecheck.check 2>&1; test $? = 2) | %FILECHECK_TESTER_EXEC %s --match-full-lines -; CHECK: {{^.*}}FileCheck{{$}} +; CHECK: {{^.*}}FileCheck{{(\.py)?$}} ; CHECK: {{.*}}filecheck.check:1:3: error: found 'CHECK-EMPTY' without previous 'CHECK: line{{$}} ; CHECK: {{^}}; CHECK-EMPTY:{{$}} ; CHECK: {{^}} ^ diff --git a/tests/integration/tests/check_commands/CHECK-EMPTY/02-success_CHECK_EMPTY_after_CHECK/sample.itest b/tests/integration/tests/check_commands/CHECK-EMPTY/02-success_CHECK_EMPTY_after_CHECK/sample.itest index 84728e6..062b333 100644 --- a/tests/integration/tests/check_commands/CHECK-EMPTY/02-success_CHECK_EMPTY_after_CHECK/sample.itest +++ b/tests/integration/tests/check_commands/CHECK-EMPTY/02-success_CHECK_EMPTY_after_CHECK/sample.itest @@ -1,3 +1,3 @@ ; RUN: cat %S/filecheck.input | (%FILECHECK_EXEC %S/filecheck.check 2>&1; test $? = 0) | %FILECHECK_TESTER_EXEC %s --match-full-lines -; CHECK: {{^.*}}FileCheck{{$}} +; CHECK: {{^.*}}FileCheck{{(\.py)?$}} ; CHECK-EMPTY: diff --git a/tests/integration/tests/check_commands/CHECK-EMPTY/03-success_CHECK_EMPTY_after_CHECK_two_times/sample.itest b/tests/integration/tests/check_commands/CHECK-EMPTY/03-success_CHECK_EMPTY_after_CHECK_two_times/sample.itest index 84728e6..062b333 100644 --- a/tests/integration/tests/check_commands/CHECK-EMPTY/03-success_CHECK_EMPTY_after_CHECK_two_times/sample.itest +++ b/tests/integration/tests/check_commands/CHECK-EMPTY/03-success_CHECK_EMPTY_after_CHECK_two_times/sample.itest @@ -1,3 +1,3 @@ ; RUN: cat %S/filecheck.input | (%FILECHECK_EXEC %S/filecheck.check 2>&1; test $? = 0) | %FILECHECK_TESTER_EXEC %s --match-full-lines -; CHECK: {{^.*}}FileCheck{{$}} +; CHECK: {{^.*}}FileCheck{{(\.py)?$}} ; CHECK-EMPTY: diff --git a/tests/integration/tests/check_commands/CHECK-NEXT/01-negative_match_line_does_not_exist/sample.itest b/tests/integration/tests/check_commands/CHECK-NEXT/01-negative_match_line_does_not_exist/sample.itest index 45625f7..be300e1 100644 --- a/tests/integration/tests/check_commands/CHECK-NEXT/01-negative_match_line_does_not_exist/sample.itest +++ b/tests/integration/tests/check_commands/CHECK-NEXT/01-negative_match_line_does_not_exist/sample.itest @@ -1,5 +1,5 @@ ; 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{{$}} +; CHECK:{{^.*}}FileCheck{{(\.py)?$}} ; CHECK:{{.*}}filecheck.check:2:15: error: CHECK-NEXT: expected string not found in input ; CHECK:; CHECK-NEXT: foo ; CHECK: ^ diff --git a/tests/integration/tests/check_commands/CHECK-NEXT/02-negative_match_line_exist_but_later/sample.itest b/tests/integration/tests/check_commands/CHECK-NEXT/02-negative_match_line_exist_but_later/sample.itest index b7ab47f..52cda22 100644 --- a/tests/integration/tests/check_commands/CHECK-NEXT/02-negative_match_line_exist_but_later/sample.itest +++ b/tests/integration/tests/check_commands/CHECK-NEXT/02-negative_match_line_exist_but_later/sample.itest @@ -1,5 +1,5 @@ ; 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{{$}} +; CHECK:{{^.*}}FileCheck{{(\.py)?$}} ; CHECK-NEXT:{{.*}}filecheck.check:2:15: error: CHECK-NEXT: is not on the line after the previous match{{$}} ; CHECK-NEXT:; CHECK-NEXT: string 3 ; CHECK-NEXT: ^ diff --git a/tests/integration/tests/check_commands/CHECK-NOT/one_string/negative/01-negative_match/sample.itest b/tests/integration/tests/check_commands/CHECK-NOT/one_string/negative/01-negative_match/sample.itest index 00e6819..e5f0c74 100644 --- a/tests/integration/tests/check_commands/CHECK-NOT/one_string/negative/01-negative_match/sample.itest +++ b/tests/integration/tests/check_commands/CHECK-NOT/one_string/negative/01-negative_match/sample.itest @@ -1,5 +1,5 @@ ; 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{{$}} +; CHECK:{{^.*}}FileCheck{{(\.py)?$}} ; CHECK-NEXT:{{^.*}}filecheck.check:1:14: error: CHECK-NOT: excluded string found in input{{$}} ; CHECK-NEXT:; CHECK-NOT: hello ; CHECK-NEXT: ^ diff --git a/tests/integration/tests/check_commands/CHECK-NOT/one_string/negative/02-negative_match_whitespaces/sample.itest b/tests/integration/tests/check_commands/CHECK-NOT/one_string/negative/02-negative_match_whitespaces/sample.itest index 55513ae..be157a6 100644 --- a/tests/integration/tests/check_commands/CHECK-NOT/one_string/negative/02-negative_match_whitespaces/sample.itest +++ b/tests/integration/tests/check_commands/CHECK-NOT/one_string/negative/02-negative_match_whitespaces/sample.itest @@ -1,5 +1,5 @@ ; 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{{$}} +; CHECK:{{^.*}}FileCheck{{(\.py)?$}} ; CHECK-NEXT:{{^.*}}filecheck.check:1:14: error: CHECK-NOT: excluded string found in input{{$}} ; CHECK-NEXT:{{^; CHECK-NOT: hello world$}} ; CHECK-NEXT:{{^ \^$}} diff --git a/tests/integration/tests/check_commands/CHECK-NOT/one_string/negative/03-negative_match_regex/sample.itest b/tests/integration/tests/check_commands/CHECK-NOT/one_string/negative/03-negative_match_regex/sample.itest index bee154c..c831916 100644 --- a/tests/integration/tests/check_commands/CHECK-NOT/one_string/negative/03-negative_match_regex/sample.itest +++ b/tests/integration/tests/check_commands/CHECK-NOT/one_string/negative/03-negative_match_regex/sample.itest @@ -1,5 +1,5 @@ ; RUN: cat %S/filecheck.input | (%FILECHECK_EXEC %S/filecheck.check 2>&1; test $? == 1;) | %FILECHECK_TESTER_EXEC %s --match-full-lines -; CHECK: {{^.*}}FileCheck{{$}} +; CHECK: {{^.*}}FileCheck{{(\.py)?$}} ; CHECK-NEXT: {{^.*}}filecheck.check:1:14: error: CHECK-NOT: excluded string found in input{{$}} ; TODO: Here we could do a better match. ; CHECK-NEXT: {{^; CHECK-NOT: ...h.l.o...$}} diff --git a/tests/integration/tests/check_commands/CHECK-NOT/one_string/negative/04-negative-match-regex-escaping_non_regex_parts/sample.itest b/tests/integration/tests/check_commands/CHECK-NOT/one_string/negative/04-negative-match-regex-escaping_non_regex_parts/sample.itest index 36286ad..431269b 100644 --- a/tests/integration/tests/check_commands/CHECK-NOT/one_string/negative/04-negative-match-regex-escaping_non_regex_parts/sample.itest +++ b/tests/integration/tests/check_commands/CHECK-NOT/one_string/negative/04-negative-match-regex-escaping_non_regex_parts/sample.itest @@ -1,5 +1,5 @@ ; 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{{$}} +; CHECK:{{^.*}}FileCheck{{(\.py)?$}} ; CHECK-NEXT:{{^.*}}filecheck.check:1:14: error: CHECK-NOT: excluded string found in input{{$}} ; TODO: Here we could do a better match. ; CHECK-NEXT:{{^; CHECK-NOT: .....The following braces must be escaped by FileCheck: \( inside braces \): 0\/1.....$}} diff --git a/tests/integration/tests/check_commands/CHECK-NOT/one_string/positive/01-positive_match/sample.itest b/tests/integration/tests/check_commands/CHECK-NOT/one_string/positive/01-positive_match/sample.itest index 3b6cd23..60c6bf2 100644 --- a/tests/integration/tests/check_commands/CHECK-NOT/one_string/positive/01-positive_match/sample.itest +++ b/tests/integration/tests/check_commands/CHECK-NOT/one_string/positive/01-positive_match/sample.itest @@ -1,3 +1,3 @@ ; RUN: cat %S/filecheck.input | (%FILECHECK_EXEC %S/filecheck.check 2>&1; test $? == 0;) | %FILECHECK_TESTER_EXEC %s --match-full-lines -; CHECK: {{^.*}}FileCheck{{$}} +; CHECK: {{^.*}}FileCheck{{(\.py)?$}} ; CHECK-EMPTY: diff --git a/tests/integration/tests/check_commands/CHECK-NOT/one_string/positive/02-positive_match_regex/sample.itest b/tests/integration/tests/check_commands/CHECK-NOT/one_string/positive/02-positive_match_regex/sample.itest index 3b6cd23..60c6bf2 100644 --- a/tests/integration/tests/check_commands/CHECK-NOT/one_string/positive/02-positive_match_regex/sample.itest +++ b/tests/integration/tests/check_commands/CHECK-NOT/one_string/positive/02-positive_match_regex/sample.itest @@ -1,3 +1,3 @@ ; RUN: cat %S/filecheck.input | (%FILECHECK_EXEC %S/filecheck.check 2>&1; test $? == 0;) | %FILECHECK_TESTER_EXEC %s --match-full-lines -; CHECK: {{^.*}}FileCheck{{$}} +; CHECK: {{^.*}}FileCheck{{(\.py)?$}} ; CHECK-EMPTY: diff --git a/tests/integration/tests/check_commands/CHECK/one_string/negative-match/01-negative_match/sample.itest b/tests/integration/tests/check_commands/CHECK/one_string/negative-match/01-negative_match/sample.itest index fd2005d..27850a1 100644 --- a/tests/integration/tests/check_commands/CHECK/one_string/negative-match/01-negative_match/sample.itest +++ b/tests/integration/tests/check_commands/CHECK/one_string/negative-match/01-negative_match/sample.itest @@ -1,5 +1,5 @@ ; 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{{$}} +; CHECK:{{^.*}}FileCheck{{(\.py)?$}} ; CHECK:{{.*}}filecheck.check:1:10: error: CHECK: expected string not found in input{{$}} ; CHECK:{{^}}; CHECK: foo{{$}} ; CHECK:{{^}} ^{{$}} diff --git a/tests/integration/tests/check_commands/CHECK/one_string/negative-match/02-negative_regex_match/sample.itest b/tests/integration/tests/check_commands/CHECK/one_string/negative-match/02-negative_regex_match/sample.itest index c9bfeb6..4c54230 100644 --- a/tests/integration/tests/check_commands/CHECK/one_string/negative-match/02-negative_regex_match/sample.itest +++ b/tests/integration/tests/check_commands/CHECK/one_string/negative-match/02-negative_regex_match/sample.itest @@ -1,5 +1,5 @@ ; 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{{$}} +; CHECK:{{^.*}}FileCheck{{(\.py)?$}} ; CHECK-NEXT:{{.*}}filecheck.check:1:10: error: CHECK: expected string not found in input{{$}} ; CHECK-NEXT:{{^; CHECK: .....hello.....$}} ; CHECK-NEXT:{{^ \^$}} diff --git a/tests/integration/tests/check_commands/CHECK/one_string/negative-match/03-negative_regex_match_spaces_before_string/sample.itest b/tests/integration/tests/check_commands/CHECK/one_string/negative-match/03-negative_regex_match_spaces_before_string/sample.itest index 8db5b08..cc075d7 100644 --- a/tests/integration/tests/check_commands/CHECK/one_string/negative-match/03-negative_regex_match_spaces_before_string/sample.itest +++ b/tests/integration/tests/check_commands/CHECK/one_string/negative-match/03-negative_regex_match_spaces_before_string/sample.itest @@ -1,5 +1,5 @@ ; 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{{$}} +; CHECK:{{^.*}}FileCheck{{(\.py)?$}} ; CHECK-NEXT:{{.*}}filecheck.check:1:10: error: CHECK: expected string not found in input{{$}} ; CHECK-NEXT:{{^; CHECK: .....hello.....$}} ; CHECK-NEXT:{{^ \^$}} diff --git a/tests/integration/tests/check_commands/CHECK/one_string/positive-match/01-positive_match/sample.itest b/tests/integration/tests/check_commands/CHECK/one_string/positive-match/01-positive_match/sample.itest index 78436f6..148d242 100644 --- a/tests/integration/tests/check_commands/CHECK/one_string/positive-match/01-positive_match/sample.itest +++ b/tests/integration/tests/check_commands/CHECK/one_string/positive-match/01-positive_match/sample.itest @@ -1,3 +1,3 @@ ; RUN: cat %S/filecheck.input | %FILECHECK_EXEC %S/filecheck.check | %FILECHECK_TESTER_EXEC %s --match-full-lines -; CHECK: {{^.*}}FileCheck{{$}} +; CHECK: {{^.*}}FileCheck{{(\.py)?$}} ; CHECK-EMPTY: diff --git a/tests/integration/tests/check_commands/CHECK/one_string/positive-match/02-positive_match_whitespaces/sample.itest b/tests/integration/tests/check_commands/CHECK/one_string/positive-match/02-positive_match_whitespaces/sample.itest index 78436f6..148d242 100644 --- a/tests/integration/tests/check_commands/CHECK/one_string/positive-match/02-positive_match_whitespaces/sample.itest +++ b/tests/integration/tests/check_commands/CHECK/one_string/positive-match/02-positive_match_whitespaces/sample.itest @@ -1,3 +1,3 @@ ; RUN: cat %S/filecheck.input | %FILECHECK_EXEC %S/filecheck.check | %FILECHECK_TESTER_EXEC %s --match-full-lines -; CHECK: {{^.*}}FileCheck{{$}} +; CHECK: {{^.*}}FileCheck{{(\.py)?$}} ; CHECK-EMPTY: diff --git a/tests/integration/tests/check_commands/CHECK/one_string/positive-match/03-positive_regex_match/sample.itest b/tests/integration/tests/check_commands/CHECK/one_string/positive-match/03-positive_regex_match/sample.itest index 78436f6..148d242 100644 --- a/tests/integration/tests/check_commands/CHECK/one_string/positive-match/03-positive_regex_match/sample.itest +++ b/tests/integration/tests/check_commands/CHECK/one_string/positive-match/03-positive_regex_match/sample.itest @@ -1,3 +1,3 @@ ; RUN: cat %S/filecheck.input | %FILECHECK_EXEC %S/filecheck.check | %FILECHECK_TESTER_EXEC %s --match-full-lines -; CHECK: {{^.*}}FileCheck{{$}} +; CHECK: {{^.*}}FileCheck{{(\.py)?$}} ; CHECK-EMPTY: diff --git a/tests/integration/tests/check_commands/CHECK/one_string/positive-match/04-escaping_non_regex_parts/sample.itest b/tests/integration/tests/check_commands/CHECK/one_string/positive-match/04-escaping_non_regex_parts/sample.itest index 78436f6..148d242 100644 --- a/tests/integration/tests/check_commands/CHECK/one_string/positive-match/04-escaping_non_regex_parts/sample.itest +++ b/tests/integration/tests/check_commands/CHECK/one_string/positive-match/04-escaping_non_regex_parts/sample.itest @@ -1,3 +1,3 @@ ; RUN: cat %S/filecheck.input | %FILECHECK_EXEC %S/filecheck.check | %FILECHECK_TESTER_EXEC %s --match-full-lines -; CHECK: {{^.*}}FileCheck{{$}} +; CHECK: {{^.*}}FileCheck{{(\.py)?$}} ; CHECK-EMPTY: diff --git a/tests/integration/tests/check_commands/CHECK/three_strings/01-positive_match/sample.itest b/tests/integration/tests/check_commands/CHECK/three_strings/01-positive_match/sample.itest index 78436f6..148d242 100644 --- a/tests/integration/tests/check_commands/CHECK/three_strings/01-positive_match/sample.itest +++ b/tests/integration/tests/check_commands/CHECK/three_strings/01-positive_match/sample.itest @@ -1,3 +1,3 @@ ; RUN: cat %S/filecheck.input | %FILECHECK_EXEC %S/filecheck.check | %FILECHECK_TESTER_EXEC %s --match-full-lines -; CHECK: {{^.*}}FileCheck{{$}} +; CHECK: {{^.*}}FileCheck{{(\.py)?$}} ; CHECK-EMPTY: diff --git a/tests/integration/tests/check_commands/CHECK/three_strings/02-positive_match-one-line-between/sample.itest b/tests/integration/tests/check_commands/CHECK/three_strings/02-positive_match-one-line-between/sample.itest index 78436f6..148d242 100644 --- a/tests/integration/tests/check_commands/CHECK/three_strings/02-positive_match-one-line-between/sample.itest +++ b/tests/integration/tests/check_commands/CHECK/three_strings/02-positive_match-one-line-between/sample.itest @@ -1,3 +1,3 @@ ; RUN: cat %S/filecheck.input | %FILECHECK_EXEC %S/filecheck.check | %FILECHECK_TESTER_EXEC %s --match-full-lines -; CHECK: {{^.*}}FileCheck{{$}} +; CHECK: {{^.*}}FileCheck{{(\.py)?$}} ; CHECK-EMPTY: diff --git a/tests/integration/tests/check_commands/CHECK/three_strings/03-negative_match_first_string/sample.itest b/tests/integration/tests/check_commands/CHECK/three_strings/03-negative_match_first_string/sample.itest index b86558d..b214237 100644 --- a/tests/integration/tests/check_commands/CHECK/three_strings/03-negative_match_first_string/sample.itest +++ b/tests/integration/tests/check_commands/CHECK/three_strings/03-negative_match_first_string/sample.itest @@ -1,5 +1,5 @@ ; RUN: cat %S/filecheck.input | (%FILECHECK_EXEC %S/filecheck.check 2>&1; test $? = 1) | %FILECHECK_TESTER_EXEC %s --match-full-lines -; CHECK: {{^.*}}FileCheck{{$}} +; CHECK: {{^.*}}FileCheck{{(\.py)?$}} ; CHECK-NEXT: {{.*filecheck.check:1:.*: error: CHECK: expected string not found in input$}} ; CHECK-NEXT: {{^}}; CHECK: foo{{$}} ; CHECK-NEXT: {{^}} ^{{$}} diff --git a/tests/integration/tests/check_commands/CHECK/three_strings/04-negative_match_second_string/sample.itest b/tests/integration/tests/check_commands/CHECK/three_strings/04-negative_match_second_string/sample.itest index 5456d89..b9c54c2 100644 --- a/tests/integration/tests/check_commands/CHECK/three_strings/04-negative_match_second_string/sample.itest +++ b/tests/integration/tests/check_commands/CHECK/three_strings/04-negative_match_second_string/sample.itest @@ -1,5 +1,5 @@ ; RUN: cat %S/filecheck.input | (%FILECHECK_EXEC %S/filecheck.check 2>&1 || true) | %FILECHECK_TESTER_EXEC %s --match-full-lines -; CHECK: {{^.*}}FileCheck{{$}} +; CHECK: {{^.*}}FileCheck{{(\.py)?$}} ; CHECK: {{.*filecheck.check:2:10: error: CHECK: expected string not found in input$}} ; CHECK: {{^}}; CHECK: foo{{$}} ; CHECK: {{^}} ^{{$}} diff --git a/tests/integration/tests/check_commands/CHECK/three_strings/05-negative_match_third_string/sample.itest b/tests/integration/tests/check_commands/CHECK/three_strings/05-negative_match_third_string/sample.itest index 2cb8144..be4b26d 100644 --- a/tests/integration/tests/check_commands/CHECK/three_strings/05-negative_match_third_string/sample.itest +++ b/tests/integration/tests/check_commands/CHECK/three_strings/05-negative_match_third_string/sample.itest @@ -1,5 +1,5 @@ ; RUN: cat %S/filecheck.input | (%FILECHECK_EXEC %S/filecheck.check 2>&1 || true) | %FILECHECK_TESTER_EXEC %s --match-full-lines -; CHECK: {{^.*}}FileCheck{{$}} +; CHECK: {{^.*}}FileCheck{{(\.py)?$}} ; CHECK: {{.*filecheck.check:3:10: error: CHECK: expected string not found in input$}} ; CHECK: {{^}}; CHECK: foo{{$}} ; CHECK: {{^}} ^{{$}} diff --git a/tests/integration/tests/check_commands/CHECK/two_strings/01-positive_match/sample.itest b/tests/integration/tests/check_commands/CHECK/two_strings/01-positive_match/sample.itest index 78436f6..148d242 100644 --- a/tests/integration/tests/check_commands/CHECK/two_strings/01-positive_match/sample.itest +++ b/tests/integration/tests/check_commands/CHECK/two_strings/01-positive_match/sample.itest @@ -1,3 +1,3 @@ ; RUN: cat %S/filecheck.input | %FILECHECK_EXEC %S/filecheck.check | %FILECHECK_TESTER_EXEC %s --match-full-lines -; CHECK: {{^.*}}FileCheck{{$}} +; CHECK: {{^.*}}FileCheck{{(\.py)?$}} ; CHECK-EMPTY: diff --git a/tests/integration/tests/check_commands/CHECK/two_strings/02-positive_match-one-line-between/sample.itest b/tests/integration/tests/check_commands/CHECK/two_strings/02-positive_match-one-line-between/sample.itest index 78436f6..148d242 100644 --- a/tests/integration/tests/check_commands/CHECK/two_strings/02-positive_match-one-line-between/sample.itest +++ b/tests/integration/tests/check_commands/CHECK/two_strings/02-positive_match-one-line-between/sample.itest @@ -1,3 +1,3 @@ ; RUN: cat %S/filecheck.input | %FILECHECK_EXEC %S/filecheck.check | %FILECHECK_TESTER_EXEC %s --match-full-lines -; CHECK: {{^.*}}FileCheck{{$}} +; CHECK: {{^.*}}FileCheck{{(\.py)?$}} ; CHECK-EMPTY: diff --git a/tests/integration/tests/check_commands/CHECK/two_strings/03-negative_match_first_string/sample.itest b/tests/integration/tests/check_commands/CHECK/two_strings/03-negative_match_first_string/sample.itest index b86558d..b214237 100644 --- a/tests/integration/tests/check_commands/CHECK/two_strings/03-negative_match_first_string/sample.itest +++ b/tests/integration/tests/check_commands/CHECK/two_strings/03-negative_match_first_string/sample.itest @@ -1,5 +1,5 @@ ; RUN: cat %S/filecheck.input | (%FILECHECK_EXEC %S/filecheck.check 2>&1; test $? = 1) | %FILECHECK_TESTER_EXEC %s --match-full-lines -; CHECK: {{^.*}}FileCheck{{$}} +; CHECK: {{^.*}}FileCheck{{(\.py)?$}} ; CHECK-NEXT: {{.*filecheck.check:1:.*: error: CHECK: expected string not found in input$}} ; CHECK-NEXT: {{^}}; CHECK: foo{{$}} ; CHECK-NEXT: {{^}} ^{{$}} diff --git a/tests/integration/tests/check_commands/CHECK/two_strings/04-negative_match_second_string/sample.itest b/tests/integration/tests/check_commands/CHECK/two_strings/04-negative_match_second_string/sample.itest index 5456d89..b9c54c2 100644 --- a/tests/integration/tests/check_commands/CHECK/two_strings/04-negative_match_second_string/sample.itest +++ b/tests/integration/tests/check_commands/CHECK/two_strings/04-negative_match_second_string/sample.itest @@ -1,5 +1,5 @@ ; RUN: cat %S/filecheck.input | (%FILECHECK_EXEC %S/filecheck.check 2>&1 || true) | %FILECHECK_TESTER_EXEC %s --match-full-lines -; CHECK: {{^.*}}FileCheck{{$}} +; CHECK: {{^.*}}FileCheck{{(\.py)?$}} ; CHECK: {{.*filecheck.check:2:10: error: CHECK: expected string not found in input$}} ; CHECK: {{^}}; CHECK: foo{{$}} ; CHECK: {{^}} ^{{$}} diff --git a/tests/integration/tests/invalid_input/01_empty_invocation/sample.itest b/tests/integration/tests/invalid_input/01_empty_invocation/sample.itest index e7f1a86..f21fe02 100644 --- a/tests/integration/tests/invalid_input/01_empty_invocation/sample.itest +++ b/tests/integration/tests/invalid_input/01_empty_invocation/sample.itest @@ -1,3 +1,3 @@ ; RUN: (%FILECHECK_EXEC 2>&1; test $? = 2) | %FILECHECK_TESTER_EXEC %s --match-full-lines -; CHECK: {{^.*}}FileCheck{{$}} +; CHECK: {{^.*}}FileCheck{{(\.py)?$}} ; CHECK-NEXT: not specified diff --git a/tests/integration/tests/invalid_input/02_check_file_does_not_exist/sample.itest b/tests/integration/tests/invalid_input/02_check_file_does_not_exist/sample.itest index f4f9021..0fd93a1 100644 --- a/tests/integration/tests/invalid_input/02_check_file_does_not_exist/sample.itest +++ b/tests/integration/tests/invalid_input/02_check_file_does_not_exist/sample.itest @@ -1,4 +1,4 @@ ; RUN: (%FILECHECK_EXEC file/does/not/exist 2>&1; test $? = 2) | %FILECHECK_TESTER_EXEC %s --match-full-lines -; CHECK: {{^.*}}FileCheck{{$}} +; CHECK: {{^.*}}FileCheck{{(\.py)?$}} ; CHECK: Could not open check file 'file/does/not/exist': No such file or directory ; CHECK-EMPTY: diff --git a/tests/integration/tests/invalid_input/03_empty_check_file/sample.itest b/tests/integration/tests/invalid_input/03_empty_check_file/sample.itest index 7a52f0b..8bda0f0 100644 --- a/tests/integration/tests/invalid_input/03_empty_check_file/sample.itest +++ b/tests/integration/tests/invalid_input/03_empty_check_file/sample.itest @@ -1,4 +1,4 @@ ; RUN: echo "" | (%FILECHECK_EXEC %S/filecheck.check 2>&1; test $? = 2) | %FILECHECK_TESTER_EXEC %s --match-full-lines -; CHECK: {{^.*}}FileCheck{{$}} +; CHECK: {{^.*}}FileCheck{{(\.py)?$}} ; CHECK: error: no check strings found with prefix 'CHECK:' ; CHECK-EMPTY diff --git a/tests/integration/tests/invalid_input/04_nonempty_check_file_but_no_checks/sample.itest b/tests/integration/tests/invalid_input/04_nonempty_check_file_but_no_checks/sample.itest index 420a5f2..8bda0f0 100644 --- a/tests/integration/tests/invalid_input/04_nonempty_check_file_but_no_checks/sample.itest +++ b/tests/integration/tests/invalid_input/04_nonempty_check_file_but_no_checks/sample.itest @@ -1,4 +1,4 @@ ; RUN: echo "" | (%FILECHECK_EXEC %S/filecheck.check 2>&1; test $? = 2) | %FILECHECK_TESTER_EXEC %s --match-full-lines -; CHECK: {{.*}}FileCheck{{$}} +; CHECK: {{^.*}}FileCheck{{(\.py)?$}} ; CHECK: error: no check strings found with prefix 'CHECK:' ; CHECK-EMPTY diff --git a/tests/integration/tests/options/--check-prefix/01_positive/sample.itest b/tests/integration/tests/options/--check-prefix/01_positive/sample.itest index 02c6c3e..c678e20 100644 --- a/tests/integration/tests/options/--check-prefix/01_positive/sample.itest +++ b/tests/integration/tests/options/--check-prefix/01_positive/sample.itest @@ -2,5 +2,5 @@ ; RUN: cat %S/filecheck.input | %FILECHECK_EXEC %S/filecheck.check --check-prefix STRING2 | %FILECHECK_TESTER_EXEC %s --strict-whitespace --match-full-lines ; RUN: cat %S/filecheck.input | %FILECHECK_EXEC %S/filecheck.check --check-prefix STRING3 | %FILECHECK_TESTER_EXEC %s --strict-whitespace --match-full-lines -; CHECK:{{^.*}}FileCheck{{$}} +; CHECK:{{^.*}}FileCheck{{(\.py)?$}} ; CHECK-EMPTY: diff --git a/tests/integration/tests/options/--check-prefix/02_negative/sample.itest b/tests/integration/tests/options/--check-prefix/02_negative/sample.itest index 309b3d0..bbb172c 100644 --- a/tests/integration/tests/options/--check-prefix/02_negative/sample.itest +++ b/tests/integration/tests/options/--check-prefix/02_negative/sample.itest @@ -1,5 +1,5 @@ ; RUN: cat %S/filecheck.input | (%FILECHECK_EXEC %S/filecheck.check --check-prefix FOO 2>&1; test $? = 2) | %FILECHECK_TESTER_EXEC %s --strict-whitespace --match-full-lines -; CHECK:{{^.*}}FileCheck{{$}} +; CHECK:{{^.*}}FileCheck{{(\.py)?$}} ; CHECK:error: no check strings found with prefix 'FOO:' ; CHECK-EMPTY: diff --git a/tests/integration/tests/options/--check-prefix/03_malformed_prefix/sample.itest b/tests/integration/tests/options/--check-prefix/03_malformed_prefix/sample.itest index 8fd7316..05260aa 100644 --- a/tests/integration/tests/options/--check-prefix/03_malformed_prefix/sample.itest +++ b/tests/integration/tests/options/--check-prefix/03_malformed_prefix/sample.itest @@ -1,5 +1,5 @@ ; RUN: cat %S/filecheck.input | (%FILECHECK_EXEC %S/filecheck.check --check-prefix "GARBAGE1.23.4.2" 2>&1; test $? = 2) | %FILECHECK_TESTER_EXEC %s --strict-whitespace --match-full-lines -; CHECK:{{^.*}}FileCheck{{$}} +; CHECK:{{^.*}}FileCheck{{(\.py)?$}} ; 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: diff --git a/tests/integration/tests/options/--match-full-lines/CHECK-NOT/01_option_has_no_effect/sample.itest b/tests/integration/tests/options/--match-full-lines/CHECK-NOT/01_option_has_no_effect/sample.itest index e87f77a..74881eb 100644 --- a/tests/integration/tests/options/--match-full-lines/CHECK-NOT/01_option_has_no_effect/sample.itest +++ b/tests/integration/tests/options/--match-full-lines/CHECK-NOT/01_option_has_no_effect/sample.itest @@ -1,7 +1,7 @@ ; RUN: cat %S/filecheck.input | (%FILECHECK_EXEC %S/filecheck.check 2>&1; test $? = 1) | %FILECHECK_TESTER_EXEC %s --match-full-lines --strict-whitespace ; RUN: cat %S/filecheck.input | (%FILECHECK_EXEC %S/filecheck.check --match-full-lines 2>&1; test $? = 1) | %FILECHECK_TESTER_EXEC %s --match-full-lines --strict-whitespace -; CHECK:{{^.*}}FileCheck{{$}} +; CHECK:{{^.*}}FileCheck{{(\.py)?$}} ; CHECK:{{^.*}}filecheck.check:1:14: error: CHECK-NOT: excluded string found in input{{$}} ; CHECK:; CHECK-NOT: hello world ; CHECK: ^ diff --git a/tests/integration/tests/options/--match-full-lines/CHECK/01_matching_substring_is_rejected_when_full_match_enabled/sample.itest b/tests/integration/tests/options/--match-full-lines/CHECK/01_matching_substring_is_rejected_when_full_match_enabled/sample.itest index b9fcb8f..f615823 100644 --- a/tests/integration/tests/options/--match-full-lines/CHECK/01_matching_substring_is_rejected_when_full_match_enabled/sample.itest +++ b/tests/integration/tests/options/--match-full-lines/CHECK/01_matching_substring_is_rejected_when_full_match_enabled/sample.itest @@ -1,10 +1,10 @@ ; RUN: cat %S/filecheck.input | %FILECHECK_EXEC %S/filecheck.check | %FILECHECK_TESTER_EXEC %s --match-full-lines -check-prefix=NO_OPTION ; RUN: cat %S/filecheck.input | (%FILECHECK_EXEC %S/filecheck.check --match-full-lines 2>&1; test $? = 1) | %FILECHECK_TESTER_EXEC %s --match-full-lines --strict-whitespace -check-prefix=OPTION -; NO_OPTION: {{^.*}}FileCheck{{$}} +; NO_OPTION: {{^.*}}FileCheck{{(\.py)?$}} ; NO_OPTION-EMPTY: -; OPTION:{{^.*}}FileCheck{{$}} +; OPTION:{{^.*}}FileCheck{{(\.py)?$}} ; OPTION:{{^.*}}filecheck.check:1:10: error: CHECK: expected string not found in input{{$}} ; OPTION:; CHECK: hello world ; OPTION: ^ diff --git a/tests/integration/tests/options/--match-full-lines/CHECK/02_when_strict_whitespace_is_also_specified/01_when_no_strict_whitespace_then_leading_whitespace_is_ignored/sample.itest b/tests/integration/tests/options/--match-full-lines/CHECK/02_when_strict_whitespace_is_also_specified/01_when_no_strict_whitespace_then_leading_whitespace_is_ignored/sample.itest index c4ca444..0c97eb4 100644 --- a/tests/integration/tests/options/--match-full-lines/CHECK/02_when_strict_whitespace_is_also_specified/01_when_no_strict_whitespace_then_leading_whitespace_is_ignored/sample.itest +++ b/tests/integration/tests/options/--match-full-lines/CHECK/02_when_strict_whitespace_is_also_specified/01_when_no_strict_whitespace_then_leading_whitespace_is_ignored/sample.itest @@ -1,4 +1,4 @@ ; RUN: cat %S/filecheck.input | %FILECHECK_EXEC %S/filecheck.check --match-full-lines | %FILECHECK_TESTER_EXEC %s --match-full-lines --strict-whitespace -; CHECK:{{^.*}}FileCheck{{$}} -; CHECK-EMPTY \ No newline at end of file +; CHECK:{{^.*}}FileCheck{{(\.py)?$}} +; CHECK-EMPTY diff --git a/tests/integration/tests/options/--match-full-lines/CHECK/02_when_strict_whitespace_is_also_specified/02_when_strict_whitespace_then_leading_whitespace_is_not_ignored/01_string/sample.itest b/tests/integration/tests/options/--match-full-lines/CHECK/02_when_strict_whitespace_is_also_specified/02_when_strict_whitespace_then_leading_whitespace_is_not_ignored/01_string/sample.itest index be74292..83380c1 100644 --- a/tests/integration/tests/options/--match-full-lines/CHECK/02_when_strict_whitespace_is_also_specified/02_when_strict_whitespace_then_leading_whitespace_is_not_ignored/01_string/sample.itest +++ b/tests/integration/tests/options/--match-full-lines/CHECK/02_when_strict_whitespace_is_also_specified/02_when_strict_whitespace_then_leading_whitespace_is_not_ignored/01_string/sample.itest @@ -1,4 +1,4 @@ ; RUN: cat %S/filecheck.input | (%FILECHECK_EXEC %S/filecheck.check --match-full-lines --strict-whitespace 2>&1; test $? = 0;) | %FILECHECK_TESTER_EXEC %s --match-full-lines --strict-whitespace -; CHECK:{{^.*}}FileCheck{{$}} +; CHECK:{{^.*}}FileCheck{{(\.py)?$}} ; CHECK-EMPTY: diff --git a/tests/integration/tests/options/--match-full-lines/CHECK/02_when_strict_whitespace_is_also_specified/02_when_strict_whitespace_then_leading_whitespace_is_not_ignored/02_regex/sample.itest b/tests/integration/tests/options/--match-full-lines/CHECK/02_when_strict_whitespace_is_also_specified/02_when_strict_whitespace_then_leading_whitespace_is_not_ignored/02_regex/sample.itest index be74292..83380c1 100644 --- a/tests/integration/tests/options/--match-full-lines/CHECK/02_when_strict_whitespace_is_also_specified/02_when_strict_whitespace_then_leading_whitespace_is_not_ignored/02_regex/sample.itest +++ b/tests/integration/tests/options/--match-full-lines/CHECK/02_when_strict_whitespace_is_also_specified/02_when_strict_whitespace_then_leading_whitespace_is_not_ignored/02_regex/sample.itest @@ -1,4 +1,4 @@ ; RUN: cat %S/filecheck.input | (%FILECHECK_EXEC %S/filecheck.check --match-full-lines --strict-whitespace 2>&1; test $? = 0;) | %FILECHECK_TESTER_EXEC %s --match-full-lines --strict-whitespace -; CHECK:{{^.*}}FileCheck{{$}} +; CHECK:{{^.*}}FileCheck{{(\.py)?$}} ; CHECK-EMPTY: diff --git a/tests/integration/tests/options/--match-full-lines/CHECK/02_when_strict_whitespace_is_also_specified/02_when_strict_whitespace_then_leading_whitespace_is_not_ignored/03_string_negative/sample.itest b/tests/integration/tests/options/--match-full-lines/CHECK/02_when_strict_whitespace_is_also_specified/02_when_strict_whitespace_then_leading_whitespace_is_not_ignored/03_string_negative/sample.itest index 08af2fd..3fc4f94 100644 --- a/tests/integration/tests/options/--match-full-lines/CHECK/02_when_strict_whitespace_is_also_specified/02_when_strict_whitespace_then_leading_whitespace_is_not_ignored/03_string_negative/sample.itest +++ b/tests/integration/tests/options/--match-full-lines/CHECK/02_when_strict_whitespace_is_also_specified/02_when_strict_whitespace_then_leading_whitespace_is_not_ignored/03_string_negative/sample.itest @@ -1,6 +1,6 @@ ; RUN: cat %S/filecheck.input | (%FILECHECK_EXEC %S/filecheck.check --match-full-lines --strict-whitespace 2>&1; test $? = 1;) | %FILECHECK_TESTER_EXEC %s --match-full-lines --strict-whitespace -; CHECK:{{^.*}}FileCheck{{$}} +; CHECK:{{^.*}}FileCheck{{(\.py)?$}} ; TODO: Is this FileCheck bug? (caret is -1 wrong and therefore position is either 9 or 10) ; CHECK:{{^.*filecheck.check:1:(9|10): error: CHECK: expected string not found in input$}} ; CHECK:; CHECK: hello world diff --git a/tests/integration/tests/options/--match-full-lines/CHECK/02_when_strict_whitespace_is_also_specified/02_when_strict_whitespace_then_leading_whitespace_is_not_ignored/04_regex_negative/sample.itest b/tests/integration/tests/options/--match-full-lines/CHECK/02_when_strict_whitespace_is_also_specified/02_when_strict_whitespace_then_leading_whitespace_is_not_ignored/04_regex_negative/sample.itest index e58b902..6e2e117 100644 --- a/tests/integration/tests/options/--match-full-lines/CHECK/02_when_strict_whitespace_is_also_specified/02_when_strict_whitespace_then_leading_whitespace_is_not_ignored/04_regex_negative/sample.itest +++ b/tests/integration/tests/options/--match-full-lines/CHECK/02_when_strict_whitespace_is_also_specified/02_when_strict_whitespace_then_leading_whitespace_is_not_ignored/04_regex_negative/sample.itest @@ -1,6 +1,6 @@ ; RUN: cat %S/filecheck.input | (%FILECHECK_EXEC %S/filecheck.check --match-full-lines --strict-whitespace 2>&1; test $? = 1;) | %FILECHECK_TESTER_EXEC %s --match-full-lines --strict-whitespace -; CHECK:{{^.*}}FileCheck{{$}} +; CHECK:{{^.*}}FileCheck{{(\.py)?$}} ; TODO: Is this FileCheck bug? (caret is -1 wrong and therefore position is either 9 or 10) ; CHECK:{{^.*filecheck.check:1:(9|10): error: CHECK: expected string not found in input$}} ; TODO: Improve regex match: diff --git a/tests/integration/tests/options/--strict-whitespace/CHECK/01_input_has_mixed_spaces_and_tabs/sample.itest b/tests/integration/tests/options/--strict-whitespace/CHECK/01_input_has_mixed_spaces_and_tabs/sample.itest index 54e47f5..8cafbdb 100644 --- a/tests/integration/tests/options/--strict-whitespace/CHECK/01_input_has_mixed_spaces_and_tabs/sample.itest +++ b/tests/integration/tests/options/--strict-whitespace/CHECK/01_input_has_mixed_spaces_and_tabs/sample.itest @@ -1,10 +1,10 @@ ; RUN: cat %S/filecheck.input | %FILECHECK_EXEC %S/filecheck.check | %FILECHECK_TESTER_EXEC %s --match-full-lines -check-prefix=NO_OPTION ; RUN: cat %S/filecheck.input | (%FILECHECK_EXEC %S/filecheck.check --strict-whitespace 2>&1; test $? = 1) | %FILECHECK_TESTER_EXEC %s --match-full-lines -check-prefix=OPTION -; NO_OPTION: {{^.*}}FileCheck{{$}} +; NO_OPTION: {{^.*}}FileCheck{{(\.py)?$}} ; NO_OPTION-EMPTY: -; OPTION: {{^.*}}FileCheck{{$}} +; OPTION: {{^.*}}FileCheck{{(\.py)?$}} ; OPTION: {{^.*}}filecheck.check:1:10: error: CHECK: expected string not found in input{{$}} ; OPTION: ; CHECK: hello world hello world ; OPTION: ^ diff --git a/tests/integration/tests/options/--strict-whitespace/CHECK/02_check_has_mixed_spaces_and_tabs/sample.itest b/tests/integration/tests/options/--strict-whitespace/CHECK/02_check_has_mixed_spaces_and_tabs/sample.itest index da30e46..1109df3 100644 --- a/tests/integration/tests/options/--strict-whitespace/CHECK/02_check_has_mixed_spaces_and_tabs/sample.itest +++ b/tests/integration/tests/options/--strict-whitespace/CHECK/02_check_has_mixed_spaces_and_tabs/sample.itest @@ -1,10 +1,10 @@ ; RUN: cat %S/filecheck.input | %FILECHECK_EXEC %S/filecheck.check | %FILECHECK_TESTER_EXEC %s --match-full-lines -check-prefix=NO_OPTION ; RUN: cat %S/filecheck.input | (%FILECHECK_EXEC %S/filecheck.check --strict-whitespace 2>&1; test $? = 1) | %FILECHECK_TESTER_EXEC %s --strict-whitespace --match-full-lines -check-prefix=OPTION -; NO_OPTION: {{^.*}}FileCheck{{$}} +; NO_OPTION: {{^.*}}FileCheck{{(\.py)?$}} ; NO_OPTION-EMPTY: -; OPTION:{{^.*}}FileCheck{{$}} +; OPTION:{{^.*}}FileCheck{{(\.py)?$}} ; OPTION:{{^.*}}filecheck.check:1:10: error: CHECK: expected string not found in input{{$}} ; OPTION:; CHECK: hello world hello world ; OPTION: ^ diff --git a/tests/integration/tests/options/--strict-whitespace/CHECK_NOT/01_input_has_mixed_spaces_and_tabs/sample.itest b/tests/integration/tests/options/--strict-whitespace/CHECK_NOT/01_input_has_mixed_spaces_and_tabs/sample.itest index 5444cee..3664169 100644 --- a/tests/integration/tests/options/--strict-whitespace/CHECK_NOT/01_input_has_mixed_spaces_and_tabs/sample.itest +++ b/tests/integration/tests/options/--strict-whitespace/CHECK_NOT/01_input_has_mixed_spaces_and_tabs/sample.itest @@ -1,7 +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-prefix=NO_OPTION ; RUN: cat %S/filecheck.input | (%FILECHECK_EXEC %S/filecheck.check --strict-whitespace 2>&1; test $? = 0) | %FILECHECK_TESTER_EXEC %s --match-full-lines -check-prefix=OPTION -; NO_OPTION:{{^.*}}FileCheck{{$}} +; NO_OPTION:{{^.*}}FileCheck{{(\.py)?$}} ; NO_OPTION:{{^.*}}filecheck.check:1:14: error: CHECK-NOT: excluded string found in input{{$}} ; NO_OPTION:; CHECK-NOT: hello world hello world ; NO_OPTION: ^ @@ -10,5 +10,5 @@ ; NO_OPTION:^~~~~~~~~~~~~~~~~~~~~~~ ; NO_OPTION-EMPTY: -; OPTION: {{^.*}}FileCheck{{$}} +; OPTION: {{^.*}}FileCheck{{(\.py)?$}} ; OPTION-EMPTY: diff --git a/tests/integration/tests/options/--strict-whitespace/CHECK_NOT/02_check_has_mixed_spaces_and_tabs/sample.itest b/tests/integration/tests/options/--strict-whitespace/CHECK_NOT/02_check_has_mixed_spaces_and_tabs/sample.itest index da30e46..1109df3 100644 --- a/tests/integration/tests/options/--strict-whitespace/CHECK_NOT/02_check_has_mixed_spaces_and_tabs/sample.itest +++ b/tests/integration/tests/options/--strict-whitespace/CHECK_NOT/02_check_has_mixed_spaces_and_tabs/sample.itest @@ -1,10 +1,10 @@ ; RUN: cat %S/filecheck.input | %FILECHECK_EXEC %S/filecheck.check | %FILECHECK_TESTER_EXEC %s --match-full-lines -check-prefix=NO_OPTION ; RUN: cat %S/filecheck.input | (%FILECHECK_EXEC %S/filecheck.check --strict-whitespace 2>&1; test $? = 1) | %FILECHECK_TESTER_EXEC %s --strict-whitespace --match-full-lines -check-prefix=OPTION -; NO_OPTION: {{^.*}}FileCheck{{$}} +; NO_OPTION: {{^.*}}FileCheck{{(\.py)?$}} ; NO_OPTION-EMPTY: -; OPTION:{{^.*}}FileCheck{{$}} +; OPTION:{{^.*}}FileCheck{{(\.py)?$}} ; OPTION:{{^.*}}filecheck.check:1:10: error: CHECK: expected string not found in input{{$}} ; OPTION:; CHECK: hello world hello world ; OPTION: ^ diff --git a/tests/integration/tests/real_world_samples/FileCheck-manual/CHECK-EMPTY/sample.itest b/tests/integration/tests/real_world_samples/FileCheck-manual/CHECK-EMPTY/sample.itest index 78436f6..148d242 100644 --- a/tests/integration/tests/real_world_samples/FileCheck-manual/CHECK-EMPTY/sample.itest +++ b/tests/integration/tests/real_world_samples/FileCheck-manual/CHECK-EMPTY/sample.itest @@ -1,3 +1,3 @@ ; RUN: cat %S/filecheck.input | %FILECHECK_EXEC %S/filecheck.check | %FILECHECK_TESTER_EXEC %s --match-full-lines -; CHECK: {{^.*}}FileCheck{{$}} +; CHECK: {{^.*}}FileCheck{{(\.py)?$}} ; CHECK-EMPTY: diff --git a/tests/integration/tests/real_world_samples/mull/01-mull-scalar-operator-enum/sample.itest b/tests/integration/tests/real_world_samples/mull/01-mull-scalar-operator-enum/sample.itest index 01dfa68..42b48f9 100644 --- a/tests/integration/tests/real_world_samples/mull/01-mull-scalar-operator-enum/sample.itest +++ b/tests/integration/tests/real_world_samples/mull/01-mull-scalar-operator-enum/sample.itest @@ -1,3 +1,3 @@ ; RUN: cat %S/filecheck.input | (%FILECHECK_EXEC %S/filecheck.check 2>&1; test $? = 0;) | %FILECHECK_TESTER_EXEC %s --strict-whitespace --match-full-lines -; CHECK:{{^.*}}FileCheck{{$}} +; CHECK:{{^.*}}FileCheck{{(\.py)?$}} ; CHECK-EMPTY: