Merge pull request #139 from stanislaw/implicit-check-not

Support more tests on Windows by switching to %printf (part 2)
mull-project · Apr 25, 2020 · 17d133a · 17d133a
2 parents b033158 + 2612364
commit 17d133a
Show file tree

Hide file tree

Showing 16 changed files with 9 additions and 23 deletions.
diff --git a/tests/integration/tests/examples/check-commands/CHECK-EMPTY/Failure/CHECK-EMPTY.itest b/tests/integration/tests/examples/check-commands/CHECK-EMPTY/Failure/CHECK-EMPTY.itest
@@ -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:

diff --git a/tests/integration/tests/examples/check-commands/CHECK-EMPTY/Failure/lit.local.cfg b/tests/integration/tests/examples/check-commands/CHECK-EMPTY/Failure/lit.local.cfg
@@ -1,2 +1,2 @@
-if config.is_llvm_filecheck_test or config.is_windows:
+if config.is_llvm_filecheck_test:
     config.unsupported = True
diff --git a/tests/integration/tests/examples/check-commands/CHECK-EMPTY/Success/CHECK-EMPTY.itest b/tests/integration/tests/examples/check-commands/CHECK-EMPTY/Success/CHECK-EMPTY.itest
@@ -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"
diff --git a/tests/integration/tests/examples/check-commands/CHECK-EMPTY/Success/lit.local.cfg b/tests/integration/tests/examples/check-commands/CHECK-EMPTY/Success/lit.local.cfg
diff --git a/tests/integration/tests/examples/check-commands/CHECK-NEXT/Failure/CHECK-NEXT.itest b/tests/integration/tests/examples/check-commands/CHECK-NEXT/Failure/CHECK-NEXT.itest
@@ -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

diff --git a/tests/integration/tests/examples/check-commands/CHECK-NEXT/Failure/lit.local.cfg b/tests/integration/tests/examples/check-commands/CHECK-NEXT/Failure/lit.local.cfg
diff --git a/tests/integration/tests/examples/check-commands/CHECK-NEXT/Success/CHECK-NEXT.itest b/tests/integration/tests/examples/check-commands/CHECK-NEXT/Success/CHECK-NEXT.itest
@@ -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"
diff --git a/tests/integration/tests/examples/check-commands/CHECK-NEXT/Success/lit.local.cfg b/tests/integration/tests/examples/check-commands/CHECK-NEXT/Success/lit.local.cfg
diff --git a/tests/integration/tests/examples/check-commands/CHECK-NOT/Success/CHECK-NOT.itest b/tests/integration/tests/examples/check-commands/CHECK-NOT/Success/CHECK-NOT.itest
@@ -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"
diff --git a/tests/integration/tests/examples/check-commands/CHECK-NOT/Success/lit.local.cfg b/tests/integration/tests/examples/check-commands/CHECK-NOT/Success/lit.local.cfg
diff --git a/tests/integration/tests/invalid_input/03_empty_check_file/lit.local.cfg b/tests/integration/tests/invalid_input/03_empty_check_file/lit.local.cfg
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
@@ -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
diff --git a/tests/integration/tests/invalid_input/04_nonempty_check_file_but_no_checks/lit.local.cfg b/tests/integration/tests/invalid_input/04_nonempty_check_file_but_no_checks/lit.local.cfg
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
@@ -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
diff --git a/tests/integration/tests/invalid_input/05_one_newline_symbol_input/lit.local.cfg b/tests/integration/tests/invalid_input/05_one_newline_symbol_input/lit.local.cfg
diff --git a/tests/integration/tests/invalid_input/05_one_newline_symbol_input/sample.itest b/tests/integration/tests/invalid_input/05_one_newline_symbol_input/sample.itest
@@ -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"
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"
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"
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"
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"