Skip to content

Support more tests on Windows by switching to %printf (part 2) #139

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
Apr 25, 2020
Merged

Support more tests on Windows by switching to %printf (part 2) #139

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
2 changes: 1 addition & 1 deletion tests/integration/tests/examples/check-commands/CHECK-EMPTY/Failure/CHECK-EMPTY.itest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
; RUN: printf "String1\nString2" | %expect_exit 1 %FILECHECK_EXEC "%S/CHECK-EMPTY.check" | %FILECHECK_EXEC "%s"
; RUN: %printf "String1\nString2" | %expect_exit 1 %FILECHECK_EXEC "%S/CHECK-EMPTY.check" | %FILECHECK_EXEC "%s"

; CHECK: {{^.*}}CHECK-EMPTY.check:2:13: error: CHECK-EMPTY: expected string not found in input
; CHECK: CHECK-EMPTY:
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/tests/examples/check-commands/CHECK-EMPTY/Failure/lit.local.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
if config.is_llvm_filecheck_test or config.is_windows:
if config.is_llvm_filecheck_test:
config.unsupported = True
2 changes: 1 addition & 1 deletion tests/integration/tests/examples/check-commands/CHECK-EMPTY/Success/CHECK-EMPTY.itest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
; RUN: printf "String1\n\nString2" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/CHECK-EMPTY.check"
; RUN: %printf "String1\n\nString2" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/CHECK-EMPTY.check"
2 changes: 0 additions & 2 deletions tests/integration/tests/examples/check-commands/CHECK-EMPTY/Success/lit.local.cfg
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion tests/integration/tests/examples/check-commands/CHECK-NEXT/Failure/CHECK-NEXT.itest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
; RUN: printf "String1\nfoo\nString2" | %expect_exit 1 %FILECHECK_EXEC "%S/CHECK-NEXT.check" | %FILECHECK_EXEC "%s"
; RUN: %printf "String1\nfoo\nString2" | %expect_exit 1 %FILECHECK_EXEC "%S/CHECK-NEXT.check" | %FILECHECK_EXEC "%s"

; CHECK: {{.*}}CHECK-NEXT.check:2:13: error: CHECK-NEXT: is not on the line after the previous match
; CHECK: CHECK-NEXT: String2
Expand Down
2 changes: 0 additions & 2 deletions tests/integration/tests/examples/check-commands/CHECK-NEXT/Failure/lit.local.cfg
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion tests/integration/tests/examples/check-commands/CHECK-NEXT/Success/CHECK-NEXT.itest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
; RUN: printf "String1\nString2" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/CHECK-NEXT.check"
; RUN: %printf "String1\nString2" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/CHECK-NEXT.check"
2 changes: 0 additions & 2 deletions tests/integration/tests/examples/check-commands/CHECK-NEXT/Success/lit.local.cfg
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion tests/integration/tests/examples/check-commands/CHECK-NOT/Success/CHECK-NOT.itest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
; RUN: printf "String4" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/CHECK-NOT.check"
; RUN: %printf "String4" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/CHECK-NOT.check"
2 changes: 0 additions & 2 deletions tests/integration/tests/examples/check-commands/CHECK-NOT/Success/lit.local.cfg
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions tests/integration/tests/invalid_input/03_empty_check_file/lit.local.cfg
View file
Open in desktop

This file was deleted.

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: printf "" | %expect_exit 2 %FILECHECK_EXEC "%S/filecheck.check" | %FILECHECK_TESTER_EXEC "%s" --match-full-lines
; RUN: %printf "" | %expect_exit 2 %FILECHECK_EXEC "%S/filecheck.check" | %FILECHECK_TESTER_EXEC "%s" --match-full-lines

; CHECK: error: no check strings found with prefix 'CHECK:'
; CHECK-EMPTY
2 changes: 0 additions & 2 deletions tests/integration/tests/invalid_input/04_nonempty_check_file_but_no_checks/lit.local.cfg
View file
Open in desktop

This file was deleted.

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: printf "" | %expect_exit 2 %FILECHECK_EXEC "%S/filecheck.check" | %FILECHECK_TESTER_EXEC "%s" --match-full-lines
; RUN: %printf "" | %expect_exit 2 %FILECHECK_EXEC "%S/filecheck.check" | %FILECHECK_TESTER_EXEC "%s" --match-full-lines

; CHECK: error: no check strings found with prefix 'CHECK:'
; CHECK-EMPTY
2 changes: 0 additions & 2 deletions tests/integration/tests/invalid_input/05_one_newline_symbol_input/lit.local.cfg
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion tests/integration/tests/invalid_input/05_one_newline_symbol_input/sample.itest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
; RUN: printf "\n" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check" 2>&1
; RUN: %printf "\n" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check"