Use the SwiftPM overrides consistently

Author: hartbit

build-swift-benchmarks-with-swiftpm.txt

@@ -5,7 +5,7 @@
 // RUN: rm -rf %t.dir
 // RUN: mkdir -p %t.dir/
 //
-// RUN: %{swift} build --package-path %{swift_benchmarks_path} --build-path %t.dir 2>&1 | tee %t.build-log
+// RUN: %{swift-build} --package-path %{swift_benchmarks_path} --build-path %t.dir 2>&1 | tee %t.build-log
 //
 // Check the build log.
 //

debugging-flags-SR85.py

@@ -9,7 +9,7 @@
 # RUN: touch %t.dir/tool/Package.swift
 # RUN: echo 'let foo = "bar"' > %t.dir/tool/main.swift
 # RUN: echo 'print(foo)' >> %t.dir/tool/main.swift
-# RUN: %{swift} build --package-path %t.dir/tool -v 2>&1 | tee %t.build-log
+# RUN: %{swift-build} --package-path %t.dir/tool -v 2>&1 | tee %t.build-log
 
 # RUN: echo 'breakpoint set -f main.swift -l 2' > %t.dir/lldb.script
 # RUN: echo 'run' >> %t.dir/lldb.script

example-package-dealer.py

@@ -10,7 +10,7 @@
 # RUN: git clone https://github.com/apple/example-package-dealer %t.dir/dealer
 
 # RUN: rm -rf %t.dir/dealer/.build
-# RUN: %{swift} build --package-path %t.dir/dealer 2>&1 | tee %t.build-log
+# RUN: %{swift-build} --package-path %t.dir/dealer 2>&1 | tee %t.build-log
 
 # Check the build log.
 #
@@ -38,7 +38,7 @@
 
 # Verify that another 'swift build' does nothing.
 #
-# RUN: %{swift} build --package-path %t.dir/dealer 2>&1 | tee %t.rebuild-log
+# RUN: %{swift-build} --package-path %t.dir/dealer 2>&1 | tee %t.rebuild-log
 # RUN: echo END-OF-INPUT >> %t.rebuild-log
 # RUN: %{FileCheck} --check-prefix CHECK-BUILD-LOG --input-file %t.build-log %s
 #

lit.cfg

@@ -220,10 +220,12 @@ config.substitutions.append( ('%{readelf}', readelf_path) )
 swiftpm_build = lit_config.params.get("swiftpm-build")
 if swiftpm_build is not None:
     lit_config.note("testing using swiftpm build directory: {}".format(swiftpm_build))
+    config.substitutions.append( ('%{swift-package}',  os.path.join(swiftpm_build, "swift-package")) )
     config.substitutions.append( ('%{swift-build}',  os.path.join(swiftpm_build, "swift-build")) )
     config.substitutions.append( ('%{swift-test}',  os.path.join(swiftpm_build, "swift-test")) )
     config.substitutions.append( ('%{swift-run}',  os.path.join(swiftpm_build, "swift-run")) )
 else:
+    config.substitutions.append( ('%{swift-package}', swift_path + ' package') )
     config.substitutions.append( ('%{swift-build}', swift_path + ' build') )
     config.substitutions.append( ('%{swift-test}', swift_path + ' test') )
     config.substitutions.append( ('%{swift-run}', swift_path + ' run') )

swift-build-self-host.py

@@ -14,7 +14,7 @@
 # RUN: cp -R %{swiftpm_srcdir} %t.dir/swiftpm
 
 # RUN: rm -rf %t.dir/swiftpm/.build
-# RUN: %{swift} build --package-path %t.dir/swiftpm 2>&1 | tee %t.build-log
+# RUN: %{swift-build} --package-path %t.dir/swiftpm 2>&1 | tee %t.build-log
 
 # Check the build log.
 #

swift-build.txt

@@ -6,7 +6,7 @@
 // RUN: mkdir -p %t.dir/tool
 // RUN: cp %s %t.dir/tool/Package.swift
 // RUN: echo 'print("HI")' > %t.dir/tool/main.swift
-// RUN: %{swift} build --package-path %t.dir/tool -v 2>&1 | tee %t.build-log
+// RUN: %{swift-build} --package-path %t.dir/tool -v 2>&1 | tee %t.build-log
 //
 // Check the build log.
 //

swift-package-init-exec.md

@@ -5,8 +5,8 @@
 ```
 RUN: rm -rf %t.dir
 RUN: mkdir -p %t.dir/Project
-RUN: %{swift} package --package-path %t.dir/Project init --type executable
-RUN: %{swift} build --package-path %t.dir/Project 2>&1 | tee %t.build-log
+RUN: %{swift-package} --package-path %t.dir/Project init --type executable
+RUN: %{swift-build} --package-path %t.dir/Project 2>&1 | tee %t.build-log
 ```
 
 ## Check the build log.

swift-package-init-lib.md

@@ -6,9 +6,9 @@
 ```
 RUN: rm -rf %t.dir
 RUN: mkdir -p %t.dir/Project
-RUN: %{swift} package --package-path %t.dir/Project init --type library
-RUN: %{swift} build --package-path %t.dir/Project 2>&1 | tee %t.build-log
-RUN: %{swift} test --package-path %t.dir/Project 2>&1 | tee %t.test-log
+RUN: %{swift-package} --package-path %t.dir/Project init --type library
+RUN: %{swift-build} --package-path %t.dir/Project 2>&1 | tee %t.build-log
+RUN: %{swift-test} --package-path %t.dir/Project 2>&1 | tee %t.test-log
 ```
 
 ## Check the build log.

swift-package-with-spaces.txt

@@ -7,7 +7,7 @@
 // RUN: cp %s %t.dir/more\ spaces/special\ tool/Package.swift
 // RUN: echo 'foo()' > %t.dir/more\ spaces/special\ tool/main.swift
 // RUN: echo 'func foo() { print("HI") }' > %t.dir/more\ spaces/special\ tool/some\ file.swift
-// RUN: %{swift} build --package-path %t.dir/more\ spaces/special\ tool -v 2>&1 | tee %t.build-log
+// RUN: %{swift-build} --package-path %t.dir/more\ spaces/special\ tool -v 2>&1 | tee %t.build-log
 //
 // Check the build log.
 //

swift-run.md

@@ -5,9 +5,9 @@
 ```
 RUN: rm -rf %t.dir
 RUN: mkdir -p %t.dir/secho
-RUN: %{swift} package --package-path %t.dir/secho init --type executable
+RUN: %{swift-package} --package-path %t.dir/secho init --type executable
 RUN: echo "import Foundation; print(CommandLine.arguments.dropFirst().joined(separator: \" \"))" >%t.dir/secho/Sources/secho/main.swift
-RUN: %{swift} run --package-path %t.dir/secho secho 1 "two" 2>&1 | tee %t.run-log
+RUN: %{swift-run} --package-path %t.dir/secho secho 1 "two" 2>&1 | tee %t.run-log
 ```
 
 ## Check the run log.