Convert SwiftPM tests to use latest manifests

<rdar://problem/42022436> Convert SwiftPM tests in swift-integration repo to PackageDescription4
apple · Jul 12, 2018 · 4ba2d66 · 4ba2d66
1 parent a39ef35
commit 4ba2d66
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 23 deletions.
diff --git a/swift-build.txt b/swift-build.txt
@@ -1,8 +1,6 @@
+// swift-tools-version:4.2
 // Trivial test for Swift build.
 //
-// <rdar://problem/42022436> Convert SwiftPM tests in swift-integration repo to PackageDescription4
-// REQUIRES: disabled
-//
 // Make a sandbox dir.
 // RUN: rm -rf %t.dir
 // RUN: mkdir -p %t.dir/tool
@@ -27,5 +25,8 @@
 import PackageDescription
 
 let package = Package(
-   name: "tool"
+   name: "tool",
+   targets: [
+       .target(name: "tool", path: "./"),
+   ]
 )
diff --git a/swift-package-with-spaces.txt b/swift-package-with-spaces.txt
@@ -1,8 +1,6 @@
+// swift-tools-version:4.2
 // Check a package with spaces.
 //
-// <rdar://problem/42022436> Convert SwiftPM tests in swift-integration repo to PackageDescription4
-// REQUIRES: disabled
-//
 // Make a sandbox dir.
 // RUN: rm -rf %t.dir
 // RUN: mkdir -p %t.dir/more\ spaces/special\ tool
@@ -28,5 +26,8 @@
 import PackageDescription
 
 let package = Package(
-   name: "special tool"
+   name: "special tool",
+   targets: [
+       .target(name: "special tool", path: "./"),
+   ]
 )
diff --git a/test-complex-xctest-package/SwiftCMixed/Package.swift b/test-complex-xctest-package/SwiftCMixed/Package.swift
@@ -1,8 +1,11 @@
+// swift-tools-version:4.2
 import PackageDescription
 
 let package = Package(
     name: "SwiftCMixed",
     targets: [
-        Target(name: "swifty", dependencies: ["see"]),
+        .target(name: "swifty", dependencies: ["see"]),
+        .target(name: "see", dependencies: []),
+        .testTarget(name: "swiftyTests", dependencies: ["swifty"]),
     ]
 )
diff --git a/test-complex-xctest-package/test-xctest-package.txt b/test-complex-xctest-package/test-xctest-package.txt
@@ -1,8 +1,5 @@
 // Check if test modules can import Swift modules which depend on C module.
 //
-// <rdar://problem/42022436> Convert SwiftPM tests in swift-integration repo to PackageDescription4
-// REQUIRES: disabled
-//
 // Make a sandbox dir.
 // RUN: rm -rf %t.dir
 // RUN: mkdir -p %t.dir

diff --git a/test-foundation-package/test-foundation-package.txt b/test-foundation-package/test-foundation-package.txt
@@ -1,8 +1,6 @@
+// swift-tools-version:4.2
 // Trivial test for importing Foundation
 //
-// <rdar://problem/42022436> Convert SwiftPM tests in swift-integration repo to PackageDescription4
-// REQUIRES: disabled
-//
 // Make a sandbox dir.
 // RUN: rm -rf %t.dir
 // RUN: mkdir -p %t.dir/tool
@@ -29,5 +27,8 @@
 import PackageDescription
 
 let package = Package(
-   name: "tool"
+   name: "tool",
+   targets: [
+       .target(name: "tool", path: "./"),
+   ]
 )
diff --git a/test-xctest-package/test-xctest-package.txt b/test-xctest-package/test-xctest-package.txt
@@ -1,11 +1,6 @@
+// swift-tools-version:4.2
 // Trivial test for importing XCTest.
 //
-// <rdar://problem/42022436> Convert SwiftPM tests in swift-integration repo to PackageDescription4
-// REQUIRES: disabled
-//
-// This test doesn't work on Darwin yet, because the XCTest overlay isn't shipped
-// with the package, and can't be found:#
-//   <rdar://problem/23600043> Cannot import XCTest with swift from a downloadable package
 // REQUIRES: platform=Linux
 //
 // Make a sandbox dir.
@@ -32,5 +27,8 @@
 import PackageDescription
 
 let package = Package(
-   name: "tool"
+   name: "tool",
+   targets: [
+       .target(name: "tool", path: "./"),
+   ]
 )