Merge pull request #116 from stanislaw/cat-vs-type

 lit: introduce %cat to abstract the difference cat vs type

.gitignore

@@ -1,3 +1,4 @@
+.idea
 .venv
 __pycache__
 *.egg-info

tests/integration/lit.cfg

@@ -2,6 +2,11 @@ import os
 
 import lit.formats
 
+
+def is_windows():
+    return os.name == 'nt'
+
+
 config.name = "FileCheck.py integration tests"
 config.test_format = lit.formats.ShTest("0")
 
@@ -17,6 +22,9 @@ real_only = lit_config.params['REAL_ONLY']
 config.substitutions.append(('%FILECHECK_EXEC', filecheck_exec))
 config.substitutions.append(('%FILECHECK_TESTER_EXEC', "{}/tests/integration/tools/FileCheck/FileCheck".format(current_dir)))
 
+cat_exec = "cat" if not is_windows() else "type"
+config.substitutions.append(('%cat', cat_exec))
+
 if real_only:
     config.suffixes = ['.itest', '.itest-llvm', '.c']
 else:

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
+; RUN: %cat "%S/filecheck.input" | %FILECHECK_EXEC "%S/filecheck.check" | %FILECHECK_TESTER_EXEC "%s" --match-full-lines
 ; CHECK: {{^.*}}FileCheck{{(\.py)?$}}
 ; CHECK-EMPTY:

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
+; RUN: %cat "%S/filecheck.input" | %FILECHECK_EXEC "%S/filecheck.check" | %FILECHECK_TESTER_EXEC "%s" --match-full-lines
 ; CHECK: {{^.*}}FileCheck{{(\.py)?$}}
 ; CHECK-EMPTY:

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
+; RUN: %cat "%S/filecheck.input" | %FILECHECK_EXEC "%S/filecheck.check" | %FILECHECK_TESTER_EXEC "%s" --match-full-lines
 ; CHECK: {{^.*}}FileCheck{{(\.py)?$}}
 ; CHECK-EMPTY:

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
+; RUN: %cat "%S/filecheck.input" | %FILECHECK_EXEC "%S/filecheck.check" | %FILECHECK_TESTER_EXEC "%s" --match-full-lines
 ; CHECK: {{^.*}}FileCheck{{(\.py)?$}}
 ; CHECK-EMPTY:

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
+; RUN: %cat "%S/filecheck.input" | %FILECHECK_EXEC "%S/filecheck.check" | %FILECHECK_TESTER_EXEC "%s" --match-full-lines
 ; CHECK: {{^.*}}FileCheck{{(\.py)?$}}
 ; CHECK-EMPTY:

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
+; RUN: %cat "%S/filecheck.input" | %FILECHECK_EXEC "%S/filecheck.check" | %FILECHECK_TESTER_EXEC "%s" --match-full-lines
 ; CHECK: {{^.*}}FileCheck{{(\.py)?$}}
 ; CHECK-EMPTY: