diff --git a/Package.swift b/Package.swift index ac21326..1fb5bf9 100644 --- a/Package.swift +++ b/Package.swift @@ -49,7 +49,7 @@ let package = Package( targets: [ .target(name: "CIndexStore"), .target(name: "IndexStore", dependencies: ["CIndexStore"], linkerSettings: indexLinkerSettings), - .testTarget(name: "IndexStoreTests", dependencies: ["IndexStore"], exclude: ["BUILD", "Data"]), + .testTarget(name: "IndexStoreTests", dependencies: ["IndexStore"], exclude: ["BUILD"]), .target( name: "CSwiftDemangle", cxxSettings: [.headerSearchPath("PrivateHeaders/include")], diff --git a/Tests/IndexStoreTests/BUILD b/Tests/IndexStoreTests/BUILD index da8544a..e5d5704 100644 --- a/Tests/IndexStoreTests/BUILD +++ b/Tests/IndexStoreTests/BUILD @@ -1,4 +1,18 @@ -load("@build_bazel_rules_swift//swift:swift.bzl", "swift_test") +load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library", "swift_test") + +swift_library( + name = "dummy", + testonly = True, + srcs = ["dummy.swift"], + features = ["swift.index_while_building"], +) + +filegroup( + name = "dummy-index", + testonly = True, + srcs = [":dummy"], + output_group = "swift_index_store", +) swift_test( name = "IndexStoreTests", @@ -6,9 +20,7 @@ swift_test( "DetermineIndexStorePath.swift", "IndexStoreTests.swift", ], - data = glob([ - "Data/**", - ]), + data = [":dummy-index"], deps = [ "//:IndexStore", ], diff --git a/Tests/IndexStoreTests/Data/main.indexstore/v5/records/19/arm64e-apple-macos.swiftinterface_Math-1XV1PJVF5ZT19 b/Tests/IndexStoreTests/Data/main.indexstore/v5/records/19/arm64e-apple-macos.swiftinterface_Math-1XV1PJVF5ZT19 deleted file mode 100755 index 08cac97..0000000 Binary files a/Tests/IndexStoreTests/Data/main.indexstore/v5/records/19/arm64e-apple-macos.swiftinterface_Math-1XV1PJVF5ZT19 and /dev/null differ diff --git a/Tests/IndexStoreTests/Data/main.indexstore/v5/records/1Y/arm64e-apple-macos.swiftinterface_Math_Integers-RH8FKXZM8O1Y b/Tests/IndexStoreTests/Data/main.indexstore/v5/records/1Y/arm64e-apple-macos.swiftinterface_Math_Integers-RH8FKXZM8O1Y deleted file mode 100755 index 7001b99..0000000 Binary files a/Tests/IndexStoreTests/Data/main.indexstore/v5/records/1Y/arm64e-apple-macos.swiftinterface_Math_Integers-RH8FKXZM8O1Y and /dev/null differ diff --git a/Tests/IndexStoreTests/Data/main.indexstore/v5/records/35/arm64e-apple-macos.swiftinterface_Collection_HashedCollections-X1RM6KOM2435 b/Tests/IndexStoreTests/Data/main.indexstore/v5/records/35/arm64e-apple-macos.swiftinterface_Collection_HashedCollections-X1RM6KOM2435 deleted file mode 100755 index 4aeb3d7..0000000 Binary files a/Tests/IndexStoreTests/Data/main.indexstore/v5/records/35/arm64e-apple-macos.swiftinterface_Collection_HashedCollections-X1RM6KOM2435 and /dev/null differ diff --git a/Tests/IndexStoreTests/Data/main.indexstore/v5/records/5X/arm64e-apple-macos.swiftinterface_Collection-100NVALLCUV5X b/Tests/IndexStoreTests/Data/main.indexstore/v5/records/5X/arm64e-apple-macos.swiftinterface_Collection-100NVALLCUV5X deleted file mode 100755 index 1682e05..0000000 Binary files a/Tests/IndexStoreTests/Data/main.indexstore/v5/records/5X/arm64e-apple-macos.swiftinterface_Collection-100NVALLCUV5X and /dev/null differ diff --git a/Tests/IndexStoreTests/Data/main.indexstore/v5/records/6Y/arm64e-apple-macos.swiftinterface_Math_Vector-HD98BLXTX66Y b/Tests/IndexStoreTests/Data/main.indexstore/v5/records/6Y/arm64e-apple-macos.swiftinterface_Math_Vector-HD98BLXTX66Y deleted file mode 100755 index e228807..0000000 Binary files a/Tests/IndexStoreTests/Data/main.indexstore/v5/records/6Y/arm64e-apple-macos.swiftinterface_Math_Vector-HD98BLXTX66Y and /dev/null differ diff --git a/Tests/IndexStoreTests/Data/main.indexstore/v5/records/79/arm64e-apple-macos.swiftinterface_Reflection-23WEYYATJ6M79 b/Tests/IndexStoreTests/Data/main.indexstore/v5/records/79/arm64e-apple-macos.swiftinterface_Reflection-23WEYYATJ6M79 deleted file mode 100755 index 6a908bd..0000000 Binary files a/Tests/IndexStoreTests/Data/main.indexstore/v5/records/79/arm64e-apple-macos.swiftinterface_Reflection-23WEYYATJ6M79 and /dev/null differ diff --git a/Tests/IndexStoreTests/Data/main.indexstore/v5/records/85/arm64e-apple-macos.swiftinterface_Result-196P5TZD7SO85 b/Tests/IndexStoreTests/Data/main.indexstore/v5/records/85/arm64e-apple-macos.swiftinterface_Result-196P5TZD7SO85 deleted file mode 100755 index e4e7af5..0000000 Binary files a/Tests/IndexStoreTests/Data/main.indexstore/v5/records/85/arm64e-apple-macos.swiftinterface_Result-196P5TZD7SO85 and /dev/null differ diff --git a/Tests/IndexStoreTests/Data/main.indexstore/v5/records/CH/arm64e-apple-macos.swiftinterface-3276HE1SPPICH b/Tests/IndexStoreTests/Data/main.indexstore/v5/records/CH/arm64e-apple-macos.swiftinterface-3276HE1SPPICH deleted file mode 100755 index 1b08b9f..0000000 Binary files a/Tests/IndexStoreTests/Data/main.indexstore/v5/records/CH/arm64e-apple-macos.swiftinterface-3276HE1SPPICH and /dev/null differ diff --git a/Tests/IndexStoreTests/Data/main.indexstore/v5/records/DD/arm64e-apple-macos.swiftinterface_Bool-3EU87B9YY44DD b/Tests/IndexStoreTests/Data/main.indexstore/v5/records/DD/arm64e-apple-macos.swiftinterface_Bool-3EU87B9YY44DD deleted file mode 100755 index e789cb1..0000000 Binary files a/Tests/IndexStoreTests/Data/main.indexstore/v5/records/DD/arm64e-apple-macos.swiftinterface_Bool-3EU87B9YY44DD and /dev/null differ diff --git a/Tests/IndexStoreTests/Data/main.indexstore/v5/records/DZ/arm64e-apple-macos.swiftinterface_Assert-QC2TV6Y48ADZ b/Tests/IndexStoreTests/Data/main.indexstore/v5/records/DZ/arm64e-apple-macos.swiftinterface_Assert-QC2TV6Y48ADZ deleted file mode 100755 index 23e84f9..0000000 Binary files a/Tests/IndexStoreTests/Data/main.indexstore/v5/records/DZ/arm64e-apple-macos.swiftinterface_Assert-QC2TV6Y48ADZ and /dev/null differ diff --git a/Tests/IndexStoreTests/Data/main.indexstore/v5/records/GS/arm64e-apple-macos.swiftinterface_Protocols-2W6N8LKCBZSGS b/Tests/IndexStoreTests/Data/main.indexstore/v5/records/GS/arm64e-apple-macos.swiftinterface_Protocols-2W6N8LKCBZSGS deleted file mode 100755 index 578b129..0000000 Binary files a/Tests/IndexStoreTests/Data/main.indexstore/v5/records/GS/arm64e-apple-macos.swiftinterface_Protocols-2W6N8LKCBZSGS and /dev/null differ diff --git a/Tests/IndexStoreTests/Data/main.indexstore/v5/records/H2/arm64e-apple-macos.swiftinterface_String-QZPS19PRNDH2 b/Tests/IndexStoreTests/Data/main.indexstore/v5/records/H2/arm64e-apple-macos.swiftinterface_String-QZPS19PRNDH2 deleted file mode 100755 index effef47..0000000 Binary files a/Tests/IndexStoreTests/Data/main.indexstore/v5/records/H2/arm64e-apple-macos.swiftinterface_String-QZPS19PRNDH2 and /dev/null differ diff --git a/Tests/IndexStoreTests/Data/main.indexstore/v5/records/IQ/arm64e-apple-macos.swiftinterface_Collection_Lazy_Views-37DLZ8UL4S3IQ b/Tests/IndexStoreTests/Data/main.indexstore/v5/records/IQ/arm64e-apple-macos.swiftinterface_Collection_Lazy_Views-37DLZ8UL4S3IQ deleted file mode 100755 index 46c6914..0000000 Binary files a/Tests/IndexStoreTests/Data/main.indexstore/v5/records/IQ/arm64e-apple-macos.swiftinterface_Collection_Lazy_Views-37DLZ8UL4S3IQ and /dev/null differ diff --git a/Tests/IndexStoreTests/Data/main.indexstore/v5/records/JZ/arm64e-apple-macos.swiftinterface_Playground-2L1EQDSAOP7JZ b/Tests/IndexStoreTests/Data/main.indexstore/v5/records/JZ/arm64e-apple-macos.swiftinterface_Playground-2L1EQDSAOP7JZ deleted file mode 100755 index ba62501..0000000 Binary files a/Tests/IndexStoreTests/Data/main.indexstore/v5/records/JZ/arm64e-apple-macos.swiftinterface_Playground-2L1EQDSAOP7JZ and /dev/null differ diff --git a/Tests/IndexStoreTests/Data/main.indexstore/v5/records/K7/main.swift-2SIFDOCAAPKK7 b/Tests/IndexStoreTests/Data/main.indexstore/v5/records/K7/main.swift-2SIFDOCAAPKK7 deleted file mode 100755 index 6819669..0000000 Binary files a/Tests/IndexStoreTests/Data/main.indexstore/v5/records/K7/main.swift-2SIFDOCAAPKK7 and /dev/null differ diff --git a/Tests/IndexStoreTests/Data/main.indexstore/v5/records/NW/arm64e-apple-macos.swiftinterface_Collection_Type-erased-1MK0RNO1A5BNW b/Tests/IndexStoreTests/Data/main.indexstore/v5/records/NW/arm64e-apple-macos.swiftinterface_Collection_Type-erased-1MK0RNO1A5BNW deleted file mode 100755 index c05e665..0000000 Binary files a/Tests/IndexStoreTests/Data/main.indexstore/v5/records/NW/arm64e-apple-macos.swiftinterface_Collection_Type-erased-1MK0RNO1A5BNW and /dev/null differ diff --git a/Tests/IndexStoreTests/Data/main.indexstore/v5/records/PJ/arm64e-apple-macos.swiftinterface_C-4NCD70UEZ5PJ b/Tests/IndexStoreTests/Data/main.indexstore/v5/records/PJ/arm64e-apple-macos.swiftinterface_C-4NCD70UEZ5PJ deleted file mode 100755 index 8897fe4..0000000 Binary files a/Tests/IndexStoreTests/Data/main.indexstore/v5/records/PJ/arm64e-apple-macos.swiftinterface_C-4NCD70UEZ5PJ and /dev/null differ diff --git a/Tests/IndexStoreTests/Data/main.indexstore/v5/records/QF/arm64e-apple-macos.swiftinterface_KeyPaths-1IVVXMWN7TOQF b/Tests/IndexStoreTests/Data/main.indexstore/v5/records/QF/arm64e-apple-macos.swiftinterface_KeyPaths-1IVVXMWN7TOQF deleted file mode 100755 index 512cf04..0000000 Binary files a/Tests/IndexStoreTests/Data/main.indexstore/v5/records/QF/arm64e-apple-macos.swiftinterface_KeyPaths-1IVVXMWN7TOQF and /dev/null differ diff --git a/Tests/IndexStoreTests/Data/main.indexstore/v5/records/R2/arm64e-apple-macos.swiftinterface-2K1WLFMGHJ4R2 b/Tests/IndexStoreTests/Data/main.indexstore/v5/records/R2/arm64e-apple-macos.swiftinterface-2K1WLFMGHJ4R2 deleted file mode 100755 index eca6e5f..0000000 Binary files a/Tests/IndexStoreTests/Data/main.indexstore/v5/records/R2/arm64e-apple-macos.swiftinterface-2K1WLFMGHJ4R2 and /dev/null differ diff --git a/Tests/IndexStoreTests/Data/main.indexstore/v5/records/UN/arm64e-apple-macos.swiftinterface_Optional-2O9Y4AX0UEMUN b/Tests/IndexStoreTests/Data/main.indexstore/v5/records/UN/arm64e-apple-macos.swiftinterface_Optional-2O9Y4AX0UEMUN deleted file mode 100755 index d931c83..0000000 Binary files a/Tests/IndexStoreTests/Data/main.indexstore/v5/records/UN/arm64e-apple-macos.swiftinterface_Optional-2O9Y4AX0UEMUN and /dev/null differ diff --git a/Tests/IndexStoreTests/Data/main.indexstore/v5/records/UQ/arm64e-apple-macos.swiftinterface_Pointer-PSSHPX3A5JUQ b/Tests/IndexStoreTests/Data/main.indexstore/v5/records/UQ/arm64e-apple-macos.swiftinterface_Pointer-PSSHPX3A5JUQ deleted file mode 100755 index 5cee650..0000000 Binary files a/Tests/IndexStoreTests/Data/main.indexstore/v5/records/UQ/arm64e-apple-macos.swiftinterface_Pointer-PSSHPX3A5JUQ and /dev/null differ diff --git a/Tests/IndexStoreTests/Data/main.indexstore/v5/records/XQ/arm64e-apple-macos.swiftinterface_Collection_Array-1DKMGBFSA2WXQ b/Tests/IndexStoreTests/Data/main.indexstore/v5/records/XQ/arm64e-apple-macos.swiftinterface_Collection_Array-1DKMGBFSA2WXQ deleted file mode 100755 index 2e13d5c..0000000 Binary files a/Tests/IndexStoreTests/Data/main.indexstore/v5/records/XQ/arm64e-apple-macos.swiftinterface_Collection_Array-1DKMGBFSA2WXQ and /dev/null differ diff --git a/Tests/IndexStoreTests/Data/main.indexstore/v5/records/XT/arm64e-apple-macos.swiftinterface_Math_Floating-J539T6A8RKXT b/Tests/IndexStoreTests/Data/main.indexstore/v5/records/XT/arm64e-apple-macos.swiftinterface_Math_Floating-J539T6A8RKXT deleted file mode 100755 index bf1e8c8..0000000 Binary files a/Tests/IndexStoreTests/Data/main.indexstore/v5/records/XT/arm64e-apple-macos.swiftinterface_Math_Floating-J539T6A8RKXT and /dev/null differ diff --git a/Tests/IndexStoreTests/Data/main.indexstore/v5/records/Y7/arm64e-apple-macos.swiftinterface_Hashing-2HET5KICG9OY7 b/Tests/IndexStoreTests/Data/main.indexstore/v5/records/Y7/arm64e-apple-macos.swiftinterface_Hashing-2HET5KICG9OY7 deleted file mode 100755 index 4592e50..0000000 Binary files a/Tests/IndexStoreTests/Data/main.indexstore/v5/records/Y7/arm64e-apple-macos.swiftinterface_Hashing-2HET5KICG9OY7 and /dev/null differ diff --git a/Tests/IndexStoreTests/Data/main.indexstore/v5/records/ZX/arm64e-apple-macos.swiftinterface_Misc-GBQR940W6EZX b/Tests/IndexStoreTests/Data/main.indexstore/v5/records/ZX/arm64e-apple-macos.swiftinterface_Misc-GBQR940W6EZX deleted file mode 100755 index d815a8c..0000000 Binary files a/Tests/IndexStoreTests/Data/main.indexstore/v5/records/ZX/arm64e-apple-macos.swiftinterface_Misc-GBQR940W6EZX and /dev/null differ diff --git a/Tests/IndexStoreTests/Data/main.indexstore/v5/units/arm64e-apple-macos.swiftinterface-2NC9MMBGQ93DP b/Tests/IndexStoreTests/Data/main.indexstore/v5/units/arm64e-apple-macos.swiftinterface-2NC9MMBGQ93DP deleted file mode 100644 index ce90a90..0000000 Binary files a/Tests/IndexStoreTests/Data/main.indexstore/v5/units/arm64e-apple-macos.swiftinterface-2NC9MMBGQ93DP and /dev/null differ diff --git a/Tests/IndexStoreTests/Data/main.indexstore/v5/units/arm64e-apple-macos.swiftinterface-ZS94XY8CSZPA b/Tests/IndexStoreTests/Data/main.indexstore/v5/units/arm64e-apple-macos.swiftinterface-ZS94XY8CSZPA deleted file mode 100644 index 0a132d0..0000000 Binary files a/Tests/IndexStoreTests/Data/main.indexstore/v5/units/arm64e-apple-macos.swiftinterface-ZS94XY8CSZPA and /dev/null differ diff --git a/Tests/IndexStoreTests/Data/main.indexstore/v5/units/main.swift.o-ZD8RL65KA8KU b/Tests/IndexStoreTests/Data/main.indexstore/v5/units/main.swift.o-ZD8RL65KA8KU deleted file mode 100644 index 0192dd3..0000000 Binary files a/Tests/IndexStoreTests/Data/main.indexstore/v5/units/main.swift.o-ZD8RL65KA8KU and /dev/null differ diff --git a/Tests/IndexStoreTests/DetermineIndexStorePath.swift b/Tests/IndexStoreTests/DetermineIndexStorePath.swift index 7cce3db..641f062 100644 --- a/Tests/IndexStoreTests/DetermineIndexStorePath.swift +++ b/Tests/IndexStoreTests/DetermineIndexStorePath.swift @@ -10,7 +10,7 @@ import Foundation /// - Returns: Index store path for the current test environment func determineIndexStorePath() -> String { if let testSrcDir: String = ProcessInfo.processInfo.environment["TEST_SRCDIR"] { - return testSrcDir + "/_main/Tests/IndexStoreTests/Data/main.indexstore" + return testSrcDir + "/_main/Tests/IndexStoreTests/dummy.indexstore" } guard let service = ProcessInfo.processInfo.environment["XPC_SERVICE_NAME"] else { preconditionFailure("Expected XPC_SERVICE_NAME environment variable") diff --git a/Tests/IndexStoreTests/IndexStoreTests.swift b/Tests/IndexStoreTests/IndexStoreTests.swift index 59b7e10..8814549 100644 --- a/Tests/IndexStoreTests/IndexStoreTests.swift +++ b/Tests/IndexStoreTests/IndexStoreTests.swift @@ -17,7 +17,7 @@ final class IndexStoreTests: XCTestCase { for recordName in unitReader.recordNames { // Just find one record we know has some reasonable content guard recordName.hasPrefix("IndexStoreTests.swift") || - recordName.hasPrefix("main.swift") else { + recordName.hasPrefix("dummy.swift") else { continue } diff --git a/Tests/IndexStoreTests/dummy.swift b/Tests/IndexStoreTests/dummy.swift new file mode 100644 index 0000000..8dde354 --- /dev/null +++ b/Tests/IndexStoreTests/dummy.swift @@ -0,0 +1,3 @@ +func foo() -> Int { + return 5 +}