test: invoke python tools properly

compnerd · compnerd · commit 64268be6523b · 2018-04-23T17:30:09.000-07:00
Ensure that we use the correct python to run the python based tools.
This also allows these tools to run on Windows which will not
necessarily associate the python script with an interpreter (python).
diff --git a/test/Compatibility/protocol_composition.swift b/test/Compatibility/protocol_composition.swift
@@ -1,5 +1,5 @@
 // RUN: %empty-directory(%t)
-// RUN: %utils/split_file.py -o %t %s
+// RUN: %{python} %utils/split_file.py -o %t %s
 // RUN: %target-swift-frontend -typecheck -primary-file %t/swift3.swift %t/common.swift -verify -swift-version 3
 // RUN: %target-swift-frontend -typecheck -primary-file %t/swift4.swift %t/common.swift -verify -swift-version 4
 
diff --git a/test/Compatibility/throws_identifier.swift b/test/Compatibility/throws_identifier.swift
@@ -1,5 +1,5 @@
 // RUN: %empty-directory(%t)
-// RUN: %utils/split_file.py -o %t %s
+// RUN: %{python} %utils/split_file.py -o %t %s
 // RUN: %target-swift-frontend -parse -primary-file %t/swift3.swift -verify -swift-version 3
 // RUN: %target-swift-frontend -parse -primary-file %t/swift4.swift -verify -swift-version 4
 
diff --git a/test/IRGen/cf.sil b/test/IRGen/cf.sil
@@ -1,5 +1,5 @@
 // RUN: %empty-directory(%t)
-// RUN: %utils/chex.py < %s > %t/cf.sil
+// RUN: %{python} %utils/chex.py < %s > %t/cf.sil
 // RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil -sdk %S/Inputs %t/cf.sil -emit-ir -import-cf-types | %FileCheck --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize %t/cf.sil -DINT=i%target-ptrsize
 
 // REQUIRES: CPU=i386 || CPU=x86_64
diff --git a/test/IRGen/class_resilience.swift b/test/IRGen/class_resilience.swift
@@ -1,5 +1,5 @@
 // RUN: %empty-directory(%t)
-// RUN: %utils/chex.py < %s > %t/class_resilience.swift
+// RUN: %{python} %utils/chex.py < %s > %t/class_resilience.swift
 // RUN: %target-swift-frontend -emit-module -enable-resilience -enable-class-resilience -emit-module-path=%t/resilient_struct.swiftmodule -module-name=resilient_struct %S/../Inputs/resilient_struct.swift
 // RUN: %target-swift-frontend -emit-module -enable-resilience -enable-class-resilience -emit-module-path=%t/resilient_enum.swiftmodule -module-name=resilient_enum -I %t %S/../Inputs/resilient_enum.swift
 // RUN: %target-swift-frontend -emit-module -enable-resilience -enable-class-resilience -emit-module-path=%t/resilient_class.swiftmodule -module-name=resilient_class -I %t %S/../Inputs/resilient_class.swift
diff --git a/test/IRGen/generic_classes.sil b/test/IRGen/generic_classes.sil
@@ -1,5 +1,5 @@
 // RUN: %empty-directory(%t)
-// RUN: %utils/chex.py < %s > %t/generic_classes.sil
+// RUN: %{python} %utils/chex.py < %s > %t/generic_classes.sil
 // RUN: %target-swift-frontend %t/generic_classes.sil -emit-ir | %FileCheck %t/generic_classes.sil --check-prefix=CHECK --check-prefix=CHECK-%target-runtime
 // RUN: %target-swift-frontend -Osize %t/generic_classes.sil -emit-ir | %FileCheck %t/generic_classes.sil --check-prefix=OSIZE
 
diff --git a/test/IRGen/generic_structs.sil b/test/IRGen/generic_structs.sil
@@ -1,5 +1,5 @@
 // RUN: %empty-directory(%t)
-// RUN: %utils/chex.py < %s > %t/generic_structs.sil
+// RUN: %{python} %utils/chex.py < %s > %t/generic_structs.sil
 // RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil %t/generic_structs.sil -emit-ir | %FileCheck %t/generic_structs.sil
 
 // REQUIRES: CPU=x86_64
diff --git a/test/IRGen/generic_vtable.swift b/test/IRGen/generic_vtable.swift
@@ -1,5 +1,5 @@
 // RUN: %empty-directory(%t)
-// RUN: %utils/chex.py < %s > %t/generic_vtable.swift
+// RUN: %{python} %utils/chex.py < %s > %t/generic_vtable.swift
 // RUN: %target-swift-frontend %t/generic_vtable.swift -emit-ir | %FileCheck %t/generic_vtable.swift --check-prefix=CHECK
 
 // REQUIRES: CPU=x86_64
diff --git a/test/IRGen/keypaths.sil b/test/IRGen/keypaths.sil
@@ -1,7 +1,7 @@
 
 // RUN: %empty-directory(%t)
 // -- Convert <i32 0x...> constants to decimal constants that LLVM will print
-// RUN: %utils/chex.py < %s > %t/keypaths.sil
+// RUN: %{python} %utils/chex.py < %s > %t/keypaths.sil
 // RUN: %target-swift-frontend -module-name keypaths -emit-ir %s | %FileCheck %t/keypaths.sil --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize --check-prefix=CHECK-%target-os
 
 sil_stage canonical
diff --git a/test/IRGen/keypaths_objc.sil b/test/IRGen/keypaths_objc.sil
@@ -1,6 +1,6 @@
 
 // RUN: %empty-directory(%t)
-// RUN: %utils/chex.py < %s > %t/keypaths_objc.sil
+// RUN: %{python} %utils/chex.py < %s > %t/keypaths_objc.sil
 // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -emit-ir %t/keypaths_objc.sil | %FileCheck %t/keypaths_objc.sil --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize
 // REQUIRES: objc_interop
 
diff --git a/test/IRGen/property_descriptor.sil b/test/IRGen/property_descriptor.sil
@@ -1,5 +1,5 @@
 // RUN: %empty-directory(%t)
-// RUN: %utils/chex.py < %s > %t/property_descriptor.sil
+// RUN: %{python} %utils/chex.py < %s > %t/property_descriptor.sil
 // RUN: %target-swift-frontend -emit-ir %t/property_descriptor.sil | %FileCheck --check-prefix=CHECK-%target-ptrsize --check-prefix=CHECK %t/property_descriptor.sil
 
 sil_stage canonical
diff --git a/test/InterfaceHash/added_function.swift b/test/InterfaceHash/added_function.swift
@@ -1,5 +1,5 @@
 // RUN: %empty-directory(%t)
-// RUN: %utils/split_file.py -o %t %s
+// RUN: %{python} %utils/split_file.py -o %t %s
 // RUN: %target-swift-frontend -dump-interface-hash %t/a.swift 2> %t/a.hash
 // RUN: %target-swift-frontend -dump-interface-hash %t/b.swift 2> %t/b.hash
 // RUN: not cmp %t/a.hash %t/b.hash
diff --git a/test/InterfaceHash/added_method.swift b/test/InterfaceHash/added_method.swift
@@ -1,5 +1,5 @@
 // RUN: %empty-directory(%t)
-// RUN: %utils/split_file.py -o %t %s
+// RUN: %{python} %utils/split_file.py -o %t %s
 // RUN: %target-swift-frontend -dump-interface-hash %t/a.swift 2> %t/a.hash
 // RUN: %target-swift-frontend -dump-interface-hash %t/b.swift 2> %t/b.hash
 // RUN: not cmp %t/a.hash %t/b.hash
diff --git a/test/InterfaceHash/added_private_class_private_property.swift b/test/InterfaceHash/added_private_class_private_property.swift
@@ -1,5 +1,5 @@
 // RUN: %empty-directory(%t)
-// RUN: %utils/split_file.py -o %t %s
+// RUN: %{python} %utils/split_file.py -o %t %s
 // RUN: %target-swift-frontend -dump-interface-hash %t/a.swift 2> %t/a.hash
 // RUN: %target-swift-frontend -dump-interface-hash %t/b.swift 2> %t/b.hash
 // RUN: not cmp %t/a.hash %t/b.hash
diff --git a/test/InterfaceHash/added_private_class_property.swift b/test/InterfaceHash/added_private_class_property.swift
@@ -1,5 +1,5 @@
 // RUN: %empty-directory(%t)
-// RUN: %utils/split_file.py -o %t %s
+// RUN: %{python} %utils/split_file.py -o %t %s
 // RUN: %target-swift-frontend -dump-interface-hash %t/a.swift 2> %t/a.hash
 // RUN: %target-swift-frontend -dump-interface-hash %t/b.swift 2> %t/b.hash
 // RUN: not cmp %t/a.hash %t/b.hash
diff --git a/test/InterfaceHash/added_private_enum_private_property.swift b/test/InterfaceHash/added_private_enum_private_property.swift
@@ -1,5 +1,5 @@
 // RUN: %empty-directory(%t)
-// RUN: %utils/split_file.py -o %t %s
+// RUN: %{python} %utils/split_file.py -o %t %s
 // RUN: %target-swift-frontend -dump-interface-hash %t/a.swift 2> %t/a.hash
 // RUN: %target-swift-frontend -dump-interface-hash %t/b.swift 2> %t/b.hash
 // RUN: not cmp %t/a.hash %t/b.hash
diff --git a/test/InterfaceHash/added_private_enum_property.swift b/test/InterfaceHash/added_private_enum_property.swift
@@ -1,5 +1,5 @@
 // RUN: %empty-directory(%t)
-// RUN: %utils/split_file.py -o %t %s
+// RUN: %{python} %utils/split_file.py -o %t %s
 // RUN: %target-swift-frontend -dump-interface-hash %t/a.swift 2> %t/a.hash
 // RUN: %target-swift-frontend -dump-interface-hash %t/b.swift 2> %t/b.hash
 // RUN: not cmp %t/a.hash %t/b.hash
diff --git a/test/InterfaceHash/added_private_method.swift b/test/InterfaceHash/added_private_method.swift
@@ -1,5 +1,5 @@
 // RUN: %empty-directory(%t)
-// RUN: %utils/split_file.py -o %t %s
+// RUN: %{python} %utils/split_file.py -o %t %s
 // RUN: %target-swift-frontend -dump-interface-hash %t/a.swift 2> %t/a.hash
 // RUN: %target-swift-frontend -dump-interface-hash %t/b.swift 2> %t/b.hash
 // RUN: not cmp %t/a.hash %t/b.hash
diff --git a/test/InterfaceHash/added_private_method_value_types.swift b/test/InterfaceHash/added_private_method_value_types.swift
@@ -1,5 +1,5 @@
 // RUN: %empty-directory(%t)
-// RUN: %utils/split_file.py -o %t %s
+// RUN: %{python} %utils/split_file.py -o %t %s
 // RUN: %target-swift-frontend -dump-interface-hash %t/a.swift 2> %t/a.hash
 // RUN: %target-swift-frontend -dump-interface-hash %t/b.swift 2> %t/b.hash
 // RUN: not cmp %t/a.hash %t/b.hash
diff --git a/test/InterfaceHash/added_private_protocol_method.swift b/test/InterfaceHash/added_private_protocol_method.swift
@@ -1,5 +1,5 @@
 // RUN: %empty-directory(%t)
-// RUN: %utils/split_file.py -o %t %s
+// RUN: %{python} %utils/split_file.py -o %t %s
 // RUN: %target-swift-frontend -dump-interface-hash %t/a.swift 2> %t/a.hash
 // RUN: %target-swift-frontend -dump-interface-hash %t/b.swift 2> %t/b.hash
 // RUN: not cmp %t/a.hash %t/b.hash
diff --git a/test/InterfaceHash/added_private_protocol_property.swift b/test/InterfaceHash/added_private_protocol_property.swift
@@ -1,5 +1,5 @@
 // RUN: %empty-directory(%t)
-// RUN: %utils/split_file.py -o %t %s
+// RUN: %{python} %utils/split_file.py -o %t %s
 // RUN: %target-swift-frontend -dump-interface-hash %t/a.swift 2> %t/a.hash
 // RUN: %target-swift-frontend -dump-interface-hash %t/b.swift 2> %t/b.hash
 // RUN: not cmp %t/a.hash %t/b.hash
diff --git a/test/InterfaceHash/added_private_struct_private_property.swift b/test/InterfaceHash/added_private_struct_private_property.swift
@@ -1,5 +1,5 @@
 // RUN: %empty-directory(%t)
-// RUN: %utils/split_file.py -o %t %s
+// RUN: %{python} %utils/split_file.py -o %t %s
 // RUN: %target-swift-frontend -dump-interface-hash %t/a.swift 2> %t/a.hash
 // RUN: %target-swift-frontend -dump-interface-hash %t/b.swift 2> %t/b.hash
 // RUN: not cmp %t/a.hash %t/b.hash
diff --git a/test/InterfaceHash/added_private_struct_property.swift b/test/InterfaceHash/added_private_struct_property.swift
@@ -1,5 +1,5 @@
 // RUN: %empty-directory(%t)
-// RUN: %utils/split_file.py -o %t %s
+// RUN: %{python} %utils/split_file.py -o %t %s
 // RUN: %target-swift-frontend -dump-interface-hash %t/a.swift 2> %t/a.hash
 // RUN: %target-swift-frontend -dump-interface-hash %t/b.swift 2> %t/b.hash
 // RUN: not cmp %t/a.hash %t/b.hash
diff --git a/test/InterfaceHash/changed_private_var_type.swift b/test/InterfaceHash/changed_private_var_type.swift
@@ -1,5 +1,5 @@
 // RUN: %empty-directory(%t)
-// RUN: %utils/split_file.py -o %t %s
+// RUN: %{python} %utils/split_file.py -o %t %s
 // RUN: %target-swift-frontend -dump-interface-hash %t/a.swift 2> %t/a.hash
 // RUN: %target-swift-frontend -dump-interface-hash %t/b.swift 2> %t/b.hash
 // RUN: not cmp %t/a.hash %t/b.hash
diff --git a/test/InterfaceHash/changed_var_name.swift b/test/InterfaceHash/changed_var_name.swift
@@ -1,5 +1,5 @@
 // RUN: %empty-directory(%t)
-// RUN: %utils/split_file.py -o %t %s
+// RUN: %{python} %utils/split_file.py -o %t %s
 // RUN: %target-swift-frontend -dump-interface-hash %t/a.swift 2> %t/a.hash
 // RUN: %target-swift-frontend -dump-interface-hash %t/b.swift 2> %t/b.hash
 // RUN: not cmp %t/a.hash %t/b.hash
diff --git a/test/InterfaceHash/changed_var_type.swift b/test/InterfaceHash/changed_var_type.swift
@@ -1,5 +1,5 @@
 // RUN: %empty-directory(%t)
-// RUN: %utils/split_file.py -o %t %s
+// RUN: %{python} %utils/split_file.py -o %t %s
 // RUN: %target-swift-frontend -dump-interface-hash %t/a.swift 2> %t/a.hash
 // RUN: %target-swift-frontend -dump-interface-hash %t/b.swift 2> %t/b.hash
 // RUN: not cmp %t/a.hash %t/b.hash
diff --git a/test/InterfaceHash/edited_function_body.swift b/test/InterfaceHash/edited_function_body.swift
@@ -1,5 +1,5 @@
 // RUN: %empty-directory(%t)
-// RUN: %utils/split_file.py -o %t %s
+// RUN: %{python} %utils/split_file.py -o %t %s
 // RUN: %target-swift-frontend -dump-interface-hash %t/a.swift 2> %t/a.hash
 // RUN: %target-swift-frontend -dump-interface-hash %t/b.swift 2> %t/b.hash
 // RUN: cmp %t/a.hash %t/b.hash
diff --git a/test/InterfaceHash/edited_method_body.swift b/test/InterfaceHash/edited_method_body.swift
@@ -1,5 +1,5 @@
 // RUN: %empty-directory(%t)
-// RUN: %utils/split_file.py -o %t %s
+// RUN: %{python} %utils/split_file.py -o %t %s
 // RUN: %target-swift-frontend -dump-interface-hash %t/a.swift 2> %t/a.hash
 // RUN: %target-swift-frontend -dump-interface-hash %t/b.swift 2> %t/b.hash
 // RUN: cmp %t/a.hash %t/b.hash
diff --git a/test/InterfaceHash/edited_property_getter.swift b/test/InterfaceHash/edited_property_getter.swift
@@ -1,5 +1,5 @@
 // RUN: %empty-directory(%t)
-// RUN: %utils/split_file.py -o %t %s
+// RUN: %{python} %utils/split_file.py -o %t %s
 // RUN: %target-swift-frontend -dump-interface-hash %t/a.swift 2> %t/a.hash
 // RUN: %target-swift-frontend -dump-interface-hash %t/b.swift 2> %t/b.hash
 // RUN: cmp %t/a.hash %t/b.hash
diff --git a/test/Sema/accessibility_shared_private.swift b/test/Sema/accessibility_shared_private.swift
@@ -1,5 +1,5 @@
 // RUN: %empty-directory(%t)
-// RUN: %utils/split_file.py -o %t %s
+// RUN: %{python} %utils/split_file.py -o %t %s
 // RUN: %target-swift-frontend -swift-version 4 -typecheck %t/declarations.swift %t/other_file_extensions.swift -verify
 
 // BEGIN declarations.swift
diff --git a/test/attr/accessibility_multifile.swift b/test/attr/accessibility_multifile.swift
@@ -1,5 +1,5 @@
 // RUN: %empty-directory(%t)
-// RUN: %utils/split_file.py -o %t %s
+// RUN: %{python} %utils/split_file.py -o %t %s
 // RUN: %target-swift-frontend -typecheck %t/file1.swift -primary-file %t/file2.swift -verify
 
 // BEGIN file1.swift
diff --git a/test/sil-passpipeline-dump/basic.test-sh b/test/sil-passpipeline-dump/basic.test-sh
@@ -1,5 +1,5 @@
 // RUN: %sil-passpipeline-dumper -Onone | %FileCheck %s
-// RUN: %sil-passpipeline-dumper -Onone | python -c 'import json; import sys; json.load(sys.stdin)'
+// RUN: %sil-passpipeline-dumper -Onone | %{python} -c 'import json; import sys; json.load(sys.stdin)'
 
 // CHECK: [
 // CHECK:     [
