Skip to content

[swiftpm][tests] Rely on XCTest for xplat shim #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

[swiftpm][tests] Rely on XCTest for xplat shim #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions Support/swiftpm.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,6 @@
637E98DA1BD95D0A0044B53E /* Utilities.swift in Sources */ = {isa = PBXBuildFile; fileRef = 637E98D91BD95D0A0044B53E /* Utilities.swift */; };
63ACA7EC1BED42160095510D /* PackageDescriptionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63ACA7EB1BED42160095510D /* PackageDescriptionTests.swift */; };
63D2BC181BFD6287006E395C /* PackageTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63D2BC171BFD6287006E395C /* PackageTests.swift */; };
63DC25221BF413BA00EDCFBF /* XCTestCaseProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63DC25211BF413BA00EDCFBF /* XCTestCaseProvider.swift */; };
63DC25371BF413BF00EDCFBF /* XCTestCaseProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63DC25211BF413BA00EDCFBF /* XCTestCaseProvider.swift */; };
63DC25381BF413C200EDCFBF /* XCTestCaseProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63DC25211BF413BA00EDCFBF /* XCTestCaseProvider.swift */; };
B464B5F11BE41DE400086CE0 /* FunctionalBuildTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B464B5F01BE41DE400086CE0 /* FunctionalBuildTests.swift */; };
E136D9421BD5F3DD000DFCE6 /* TOMLTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E136D9411BD5F35D000DFCE6 /* TOMLTests.swift */; };
E1E286BA1BD72D700015F0C5 /* ManifestTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1E286B91BD72D700015F0C5 /* ManifestTests.swift */; };
Expand Down Expand Up @@ -192,7 +189,6 @@
637E98D91BD95D0A0044B53E /* Utilities.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = Utilities.swift; path = ../Tests/dep/Utilities.swift; sourceTree = "<group>"; };
63ACA7EB1BED42160095510D /* PackageDescriptionTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = PackageDescriptionTests.swift; path = ../Tests/PackageDescription/PackageDescriptionTests.swift; sourceTree = "<group>"; };
63D2BC171BFD6287006E395C /* PackageTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = PackageTests.swift; path = ../Tests/dep/PackageTests.swift; sourceTree = "<group>"; };
63DC25211BF413BA00EDCFBF /* XCTestCaseProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = XCTestCaseProvider.swift; path = ../Tests/XCTestCaseProvider.swift; sourceTree = "<group>"; };
B464B5F01BE41DE400086CE0 /* FunctionalBuildTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = FunctionalBuildTests.swift; path = ../Tests/dep/FunctionalBuildTests.swift; sourceTree = "<group>"; };
E1066B6E1BC5931C00B892CE /* llbuild.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = llbuild.xcodeproj; path = ../../llbuild/llbuild.xcodeproj; sourceTree = "<group>"; };
E136D9411BD5F35D000DFCE6 /* TOMLTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = TOMLTests.swift; path = ../Tests/sys/TOMLTests.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -249,7 +245,6 @@
63353A571BB4C4A900D6C4B0 /* Tests */ = {
isa = PBXGroup;
children = (
63DC25211BF413BA00EDCFBF /* XCTestCaseProvider.swift */,
63CF91C31BE9419500265702 /* PackageDescription */,
63CF91C21BE9419100265702 /* sys */,
63CF91C11BE9418D00265702 /* dep */,
Expand Down Expand Up @@ -594,7 +589,6 @@
E136D9421BD5F3DD000DFCE6 /* TOMLTests.swift in Sources */,
63353A611BB4C4CD00D6C4B0 /* ShellTests.swift in Sources */,
E1E286D61BD83BE40015F0C5 /* ResourcesTests.swift in Sources */,
63DC25371BF413BF00EDCFBF /* XCTestCaseProvider.swift in Sources */,
636EF11A1C0D0F1E00626610 /* MiscTests.swift in Sources */,
63353A621BB4C4CD00D6C4B0 /* StringTests.swift in Sources */,
);
Expand All @@ -611,7 +605,6 @@
63353A5B1BB4C4BC00D6C4B0 /* VersionTests.swift in Sources */,
637E98DA1BD95D0A0044B53E /* Utilities.swift in Sources */,
63D2BC181BFD6287006E395C /* PackageTests.swift in Sources */,
63DC25221BF413BA00EDCFBF /* XCTestCaseProvider.swift in Sources */,
635C147D1BCDA0A900D4C4A9 /* TargetTests.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand All @@ -621,7 +614,6 @@
buildActionMask = 2147483647;
files = (
63ACA7EC1BED42160095510D /* PackageDescriptionTests.swift in Sources */,
63DC25381BF413C200EDCFBF /* XCTestCaseProvider.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
2 changes: 1 addition & 1 deletion Tests/PackageDescription/PackageDescriptionTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ private func parseTOML(data: String) -> TOMLItem {
}
}

class PackageTests: XCTestCase, XCTestCaseProvider {
class PackageTests: XCTestCase {

var allTests : [(String, () -> ())] {
return [
Expand Down
6 changes: 0 additions & 6 deletions Tests/PackageDescription/main.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,4 @@
import XCTest

#if !os(Linux)
public protocol XCTestCaseProvider {
var allTests : [(String, () -> ())] { get }
}
#endif

// SharesTests.swift
PackageTests().invokeTest()
16 changes: 0 additions & 16 deletions Tests/XCTestCaseProvider.swift
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion Tests/dep/DependencyGraphTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import XCTest
@testable import dep
@testable import struct PackageDescription.Version

class VersionGraphTests: XCTestCase, XCTestCaseProvider {
class VersionGraphTests: XCTestCase {

var allTests : [(String, () -> ())] {
return [
Expand Down
2 changes: 1 addition & 1 deletion Tests/dep/FunctionalBuildTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import sys
import XCTest


class FunctionalBuildTests: XCTestCase, XCTestCaseProvider {
class FunctionalBuildTests: XCTestCase {

var allTests : [(String, () -> ())] {
return [
Expand Down
2 changes: 1 addition & 1 deletion Tests/dep/ManifestTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import sys
@testable import dep
import libc

class ManifestTests: XCTestCase, XCTestCaseProvider {
class ManifestTests: XCTestCase {

var allTests : [(String, () -> ())] {
return [
Expand Down
2 changes: 1 addition & 1 deletion Tests/dep/PackageTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import XCTest
@testable import dep

class PackageTests: XCTestCase, XCTestCaseProvider {
class PackageTests: XCTestCase {

var allTests : [(String, () -> ())] {
return [
Expand Down
2 changes: 1 addition & 1 deletion Tests/dep/TargetTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ extension Target {
}


class TargetTests: XCTestCase, XCTestCaseProvider {
class TargetTests: XCTestCase {

var allTests : [(String, () -> ())] {
return [
Expand Down
2 changes: 1 addition & 1 deletion Tests/dep/UidTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import XCTest
@testable import dep

class ProjectTests: XCTestCase, XCTestCaseProvider {
class ProjectTests: XCTestCase {

var allTests : [(String, () -> ())] {
return [
Expand Down
2 changes: 1 addition & 1 deletion Tests/dep/VersionTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import libc

@testable import struct PackageDescription.Version

class VersionTests: XCTestCase, XCTestCaseProvider {
class VersionTests: XCTestCase {

var allTests : [(String, () -> ())] {
return [
Expand Down
7 changes: 0 additions & 7 deletions Tests/dep/main.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,5 @@
import XCTest

// Support building the "enumerated"-tests style, on OS X.
#if !os(Linux)
public protocol XCTestCaseProvider {
var allTests : [(String, () -> ())] { get }
}
#endif

// DependencyGraphTests.swift
VersionGraphTests().invokeTest()

Expand Down
2 changes: 1 addition & 1 deletion Tests/sys/MiscTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import POSIX
import XCTest
import libc

class RmtreeTests: XCTestCase, XCTestCaseProvider {
class RmtreeTests: XCTestCase {

var allTests : [(String, () -> ())] {
return [
Expand Down
2 changes: 1 addition & 1 deletion Tests/sys/PathTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import XCTest
import POSIX
@testable import sys

class PathTests: XCTestCase, XCTestCaseProvider {
class PathTests: XCTestCase {

var allTests : [(String, () -> ())] {
return [
Expand Down
2 changes: 1 addition & 1 deletion Tests/sys/ResourcesTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import sys

public var globalSymbolInNonMainBinary = 0

class ResourcesTests: XCTestCase, XCTestCaseProvider {
class ResourcesTests: XCTestCase {

var allTests : [(String, () -> ())] {
return [
Expand Down
2 changes: 1 addition & 1 deletion Tests/sys/ShellTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import POSIX
import sys
import XCTest

class ShellTests: XCTestCase, XCTestCaseProvider {
class ShellTests: XCTestCase {

var allTests : [(String, () -> ())] {
return [
Expand Down
4 changes: 2 additions & 2 deletions Tests/sys/StringTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import XCTest
@testable import sys

class StringTests: XCTestCase, XCTestCaseProvider {
class StringTests: XCTestCase {

var allTests : [(String, () -> ())] {
return [
Expand Down Expand Up @@ -47,7 +47,7 @@ class StringTests: XCTestCase, XCTestCaseProvider {
}


class URLTests: XCTestCase, XCTestCaseProvider {
class URLTests: XCTestCase {

var allTests : [(String, () -> ())] {
return [
Expand Down
2 changes: 1 addition & 1 deletion Tests/sys/TOMLTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ private func parseTOML(data: String) -> TOMLItem {
}
}

class TOMLTests: XCTestCase, XCTestCaseProvider {
class TOMLTests: XCTestCase {

var allTests : [(String, () -> ())] {
return [
Expand Down
7 changes: 0 additions & 7 deletions Tests/sys/main.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,5 @@
import XCTest

// Support building the "enumerated"-tests style, on OS X.
#if !os(Linux)
public protocol XCTestCaseProvider {
var allTests : [(String, () -> ())] { get }
}
#endif

// POSIXTests.swift
PathTests().invokeTest()
WalkTests().invokeTest()
Expand Down