Skip to content

Add Poetry #42

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
Nov 30, 2019
Merged

Add Poetry #42

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
5 changes: 5 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
.venv
__pycache__
*.egg-info
dist

2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
0 src/FileCheck → filecheck/FileCheck.py
View file
Open in desktop
File renamed without changes.
14 changes: 14 additions & 0 deletions poetry.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 19 additions & 0 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 <s.pankevich@gmail.com>"]

[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"

2 changes: 1 addition & 1 deletion ...tests/check_commands/CHECK-EMPTY/01-error_CHECK_EMPTY_without_previous_CHECK/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 | (%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: {{^}} ^
Expand Down
2 changes: 1 addition & 1 deletion ...egration/tests/check_commands/CHECK-EMPTY/02-success_CHECK_EMPTY_after_CHECK/sample.itest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
2 changes: 1 addition & 1 deletion ...ests/check_commands/CHECK-EMPTY/03-success_CHECK_EMPTY_after_CHECK_two_times/sample.itest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
2 changes: 1 addition & 1 deletion ...ration/tests/check_commands/CHECK-NEXT/01-negative_match_line_does_not_exist/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 | (%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: ^
Expand Down
2 changes: 1 addition & 1 deletion ...ation/tests/check_commands/CHECK-NEXT/02-negative_match_line_exist_but_later/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 | (%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: ^
Expand Down
2 changes: 1 addition & 1 deletion ...gration/tests/check_commands/CHECK-NOT/one_string/negative/01-negative_match/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 | (%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: ^
Expand Down
2 changes: 1 addition & 1 deletion ...s/check_commands/CHECK-NOT/one_string/negative/02-negative_match_whitespaces/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 | (%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:{{^ \^$}}
Expand Down
2 changes: 1 addition & 1 deletion ...n/tests/check_commands/CHECK-NOT/one_string/negative/03-negative_match_regex/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 | (%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...$}}
Expand Down
2 changes: 1 addition & 1 deletion ...ECK-NOT/one_string/negative/04-negative-match-regex-escaping_non_regex_parts/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 | (%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.....$}}
Expand Down
2 changes: 1 addition & 1 deletion ...gration/tests/check_commands/CHECK-NOT/one_string/positive/01-positive_match/sample.itest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
2 changes: 1 addition & 1 deletion ...n/tests/check_commands/CHECK-NOT/one_string/positive/02-positive_match_regex/sample.itest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
2 changes: 1 addition & 1 deletion ...ation/tests/check_commands/CHECK/one_string/negative-match/01-negative_match/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 | (%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:{{^}} ^{{$}}
Expand Down
2 changes: 1 addition & 1 deletion ...tests/check_commands/CHECK/one_string/negative-match/02-negative_regex_match/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 | (%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:{{^ \^$}}
Expand Down
2 changes: 1 addition & 1 deletion ...CHECK/one_string/negative-match/03-negative_regex_match_spaces_before_string/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 | (%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:{{^ \^$}}
Expand Down
2 changes: 1 addition & 1 deletion ...ation/tests/check_commands/CHECK/one_string/positive-match/01-positive_match/sample.itest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
2 changes: 1 addition & 1 deletion ...check_commands/CHECK/one_string/positive-match/02-positive_match_whitespaces/sample.itest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
2 changes: 1 addition & 1 deletion ...tests/check_commands/CHECK/one_string/positive-match/03-positive_regex_match/sample.itest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
2 changes: 1 addition & 1 deletion ...s/check_commands/CHECK/one_string/positive-match/04-escaping_non_regex_parts/sample.itest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
2 changes: 1 addition & 1 deletion tests/integration/tests/check_commands/CHECK/three_strings/01-positive_match/sample.itest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
2 changes: 1 addition & 1 deletion .../tests/check_commands/CHECK/three_strings/02-positive_match-one-line-between/sample.itest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
2 changes: 1 addition & 1 deletion ...tion/tests/check_commands/CHECK/three_strings/03-negative_match_first_string/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 | (%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: {{^}} ^{{$}}
Expand Down
2 changes: 1 addition & 1 deletion ...ion/tests/check_commands/CHECK/three_strings/04-negative_match_second_string/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 | (%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: {{^}} ^{{$}}
Expand Down
2 changes: 1 addition & 1 deletion ...tion/tests/check_commands/CHECK/three_strings/05-negative_match_third_string/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 | (%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: {{^}} ^{{$}}
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/tests/check_commands/CHECK/two_strings/01-positive_match/sample.itest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
2 changes: 1 addition & 1 deletion ...on/tests/check_commands/CHECK/two_strings/02-positive_match-one-line-between/sample.itest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
2 changes: 1 addition & 1 deletion ...ration/tests/check_commands/CHECK/two_strings/03-negative_match_first_string/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 | (%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: {{^}} ^{{$}}
Expand Down
2 changes: 1 addition & 1 deletion ...ation/tests/check_commands/CHECK/two_strings/04-negative_match_second_string/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 | (%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: {{^}} ^{{$}}
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/tests/invalid_input/01_empty_invocation/sample.itest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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: <check-file> not specified
2 changes: 1 addition & 1 deletion tests/integration/tests/invalid_input/02_check_file_does_not_exist/sample.itest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
2 changes: 1 addition & 1 deletion tests/integration/tests/invalid_input/03_empty_check_file/sample.itest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion tests/integration/tests/invalid_input/04_nonempty_check_file_but_no_checks/sample.itest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion tests/integration/tests/options/--check-prefix/01_positive/sample.itest
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
2 changes: 1 addition & 1 deletion tests/integration/tests/options/--check-prefix/02_negative/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 | (%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:
2 changes: 1 addition & 1 deletion tests/integration/tests/options/--check-prefix/03_malformed_prefix/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 | (%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:
2 changes: 1 addition & 1 deletion ...tegration/tests/options/--match-full-lines/CHECK-NOT/01_option_has_no_effect/sample.itest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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: ^
Expand Down
4 changes: 2 additions & 2 deletions ...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,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: ^
Expand Down
4 changes: 2 additions & 2 deletions ...so_specified/01_when_no_strict_whitespace_then_leading_whitespace_is_ignored/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 | %FILECHECK_EXEC %S/filecheck.check --match-full-lines | %FILECHECK_TESTER_EXEC %s --match-full-lines --strict-whitespace

; CHECK:{{^.*}}FileCheck{{$}}
; CHECK-EMPTY
; CHECK:{{^.*}}FileCheck{{(\.py)?$}}
; CHECK-EMPTY
2 changes: 1 addition & 1 deletion ...d/02_when_strict_whitespace_then_leading_whitespace_is_not_ignored/01_string/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 | (%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:
2 changes: 1 addition & 1 deletion ...ed/02_when_strict_whitespace_then_leading_whitespace_is_not_ignored/02_regex/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 | (%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:
2 changes: 1 addition & 1 deletion ..._strict_whitespace_then_leading_whitespace_is_not_ignored/03_string_negative/sample.itest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...n_strict_whitespace_then_leading_whitespace_is_not_ignored/04_regex_negative/sample.itest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
4 changes: 2 additions & 2 deletions ...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,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: ^
Expand Down
4 changes: 2 additions & 2 deletions ...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,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: ^
Expand Down
4 changes: 2 additions & 2 deletions ...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,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: ^
Expand All @@ -10,5 +10,5 @@
; NO_OPTION:^~~~~~~~~~~~~~~~~~~~~~~
; NO_OPTION-EMPTY:

; OPTION: {{^.*}}FileCheck{{$}}
; OPTION: {{^.*}}FileCheck{{(\.py)?$}}
; OPTION-EMPTY:
4 changes: 2 additions & 2 deletions ...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,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: ^
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/tests/real_world_samples/FileCheck-manual/CHECK-EMPTY/sample.itest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
2 changes: 1 addition & 1 deletion tests/integration/tests/real_world_samples/mull/01-mull-scalar-operator-enum/sample.itest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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: