Support more tests on Windows by switching to %printf

stanislaw · stanislaw · commit c7a29e05cac2 · 2020-04-26T00:30:11.000+02:00
diff --git a/tests/integration/tests/check_commands/CHECK/failure/09-not-enough-input-for-all-checks/CHECK.itest b/tests/integration/tests/check_commands/CHECK/failure/09-not-enough-input-for-all-checks/CHECK.itest
@@ -1,4 +1,4 @@
-; RUN: printf "String1" | %expect_exit 1 %FILECHECK_EXEC "%S/CHECK.check" | %FILECHECK_EXEC "%s" --strict-whitespace --match-full-lines
+; RUN: %printf "String1" | %expect_exit 1 %FILECHECK_EXEC "%S/CHECK.check" | %FILECHECK_EXEC "%s" --strict-whitespace --match-full-lines
 
 // TODO: Something wrong with the greediness here:
 ; CHECK:{{^.*}}CHECK.check:2:8: error: {{CHECK}}: expected string not found in input
diff --git a/tests/integration/tests/check_commands/CHECK/failure/09-not-enough-input-for-all-checks/lit.local.cfg b/tests/integration/tests/check_commands/CHECK/failure/09-not-enough-input-for-all-checks/lit.local.cfg
diff --git a/tests/integration/tests/check_commands/CHECK/failure/edge-case-no-newline/01-edge-case-no-newline-in-llvm/CHECK.itest b/tests/integration/tests/check_commands/CHECK/failure/edge-case-no-newline/01-edge-case-no-newline-in-llvm/CHECK.itest
@@ -1,4 +1,4 @@
-; RUN: printf "String1\n" | %expect_exit 1 %FILECHECK_EXEC "%S/CHECK.check" | %FILECHECK_EXEC "%s"
+; RUN: %printf "String1\n" | %expect_exit 1 %FILECHECK_EXEC "%S/CHECK.check" | %FILECHECK_EXEC "%s"
 
 ; CHECK: {{.*}}CHECK.check:2:8: error: CHECK: expected string not found in input
 ; CHECK: CHECK: String2
diff --git a/tests/integration/tests/check_commands/CHECK/failure/edge-case-no-newline/01-edge-case-no-newline-in-llvm/lit.local.cfg b/tests/integration/tests/check_commands/CHECK/failure/edge-case-no-newline/01-edge-case-no-newline-in-llvm/lit.local.cfg
@@ -1,2 +1,2 @@
-if not config.is_llvm_filecheck_test or config.is_windows:
+if not config.is_llvm_filecheck_test:
     config.unsupported = True
diff --git a/tests/integration/tests/check_commands/CHECK/failure/edge-case-no-newline/02-edge-case-no-newline-in-py/CHECK.itest b/tests/integration/tests/check_commands/CHECK/failure/edge-case-no-newline/02-edge-case-no-newline-in-py/CHECK.itest
@@ -1,4 +1,4 @@
-; RUN: printf "String1\n" | %expect_exit 1 %FILECHECK_EXEC "%S/CHECK.check" | %FILECHECK_EXEC "%s" --strict-whitespace --match-full-lines
+; RUN: %printf "String1\n" | %expect_exit 1 %FILECHECK_EXEC "%S/CHECK.check" | %FILECHECK_EXEC "%s" --strict-whitespace --match-full-lines
 
 // TODO: Something wrong with the greediness here:
 ; CHECK***:{{^.*}}CHECK.check:2:8: error: CHECK***: expected string not found in input
diff --git a/tests/integration/tests/check_commands/CHECK/failure/edge-case-no-newline/02-edge-case-no-newline-in-py/lit.local.cfg b/tests/integration/tests/check_commands/CHECK/failure/edge-case-no-newline/02-edge-case-no-newline-in-py/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/check_commands/CHECK/one_string/positive-match/02-positive_match_check_without_preceeding_semicolon/lit.local.cfg b/tests/integration/tests/check_commands/CHECK/one_string/positive-match/02-positive_match_check_without_preceeding_semicolon/lit.local.cfg
diff --git a/tests/integration/tests/check_commands/CHECK/one_string/positive-match/02-positive_match_check_without_preceeding_semicolon/sample.itest b/tests/integration/tests/check_commands/CHECK/one_string/positive-match/02-positive_match_check_without_preceeding_semicolon/sample.itest
@@ -1 +1 @@
-; RUN: printf "hello" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check"
+; RUN: %printf "hello" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check"

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-; RUN: printf "String1" \| %expect_exit 1 %FILECHECK_EXEC "%S/CHECK.check" \| %FILECHECK_EXEC "%s" --strict-whitespace --match-full-lines`
	`1`	`+; RUN: %printf "String1" \| %expect_exit 1 %FILECHECK_EXEC "%S/CHECK.check" \| %FILECHECK_EXEC "%s" --strict-whitespace --match-full-lines`
`2`	`2`
`3`	`3`	`// TODO: Something wrong with the greediness here:`
`4`	`4`	`; CHECK:{{^.*}}CHECK.check:2:8: error: {{CHECK}}: expected string not found in input`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-; RUN: printf "String1\n" \| %expect_exit 1 %FILECHECK_EXEC "%S/CHECK.check" \| %FILECHECK_EXEC "%s"`
	`1`	`+; RUN: %printf "String1\n" \| %expect_exit 1 %FILECHECK_EXEC "%S/CHECK.check" \| %FILECHECK_EXEC "%s"`
`2`	`2`
`3`	`3`	`; CHECK: {{.*}}CHECK.check:2:8: error: CHECK: expected string not found in input`
`4`	`4`	`; CHECK: CHECK: String2`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-if not config.is_llvm_filecheck_test or config.is_windows:`
	`1`	`+if not config.is_llvm_filecheck_test:`
`2`	`2`	`config.unsupported = True`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-if config.is_llvm_filecheck_test or config.is_windows:`
	`1`	`+if config.is_llvm_filecheck_test:`
`2`	`2`	`config.unsupported = True`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-; RUN: printf "hello" \| %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check"`
	`1`	`+; RUN: %printf "hello" \| %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check"`