Skip to content

Commit 0a290ca

Browse files
owenvowenv
authored
Merge pull request #655 from owenv/owenv/loosen-codesign
Loosen test expectations in framework pruning tests
2 parents 26be248 + 4764254 commit 0a290ca

File tree

1 file changed

+5
-49
lines changed

1 file changed

+5
-49
lines changed

‎Tests/SWBBuildSystemTests/BuildOperationTests.swift

Lines changed: 5 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -2928,12 +2928,6 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
29282928
"Versions/A/Resources/Info.plist",
29292929
"Versions/A/Resources/ja.lproj",
29302930
"Versions/A/Resources/ja.lproj/Localizable.strings",
2931-
"Versions/A/_CodeSignature",
2932-
"Versions/A/_CodeSignature/CodeDirectory",
2933-
"Versions/A/_CodeSignature/CodeRequirements",
2934-
"Versions/A/_CodeSignature/CodeRequirements-1",
2935-
"Versions/A/_CodeSignature/CodeResources",
2936-
"Versions/A/_CodeSignature/CodeSignature",
29372931
"Versions/Current",
29382932
]
29392933

@@ -2970,12 +2964,6 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
29702964
"Versions/A/Headers/AFwk.h",
29712965
"Versions/A/Resources/AResource.plist",
29722966
"Versions/A/Resources/Info.plist",
2973-
"Versions/A/_CodeSignature",
2974-
"Versions/A/_CodeSignature/CodeDirectory",
2975-
"Versions/A/_CodeSignature/CodeRequirements",
2976-
"Versions/A/_CodeSignature/CodeRequirements-1",
2977-
"Versions/A/_CodeSignature/CodeResources",
2978-
"Versions/A/_CodeSignature/CodeSignature",
29792967
"Versions/Current",
29802968
])
29812969
}
@@ -3061,7 +3049,7 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
30613049
]))
30623050
}
30633051

3064-
let sourceDynamicFrameworkFiles = try tester.fs.traverse(sourceDynamicFrameworkPath, { $0.relativeSubpath(from: sourceDynamicFrameworkPath) }).sorted()
3052+
let sourceDynamicFrameworkFiles = try tester.fs.traverse(sourceDynamicFrameworkPath, { $0.relativeSubpath(from: sourceDynamicFrameworkPath) }).sorted().filter { !$0.contains("_CodeSignature") }
30653053
if runDestination.platform == "macosx" {
30663054
XCTAssertEqualSequences(sourceDynamicFrameworkFiles, [
30673055
"ADynamicFwk",
@@ -3075,12 +3063,6 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
30753063
"Versions/A/Resources",
30763064
"Versions/A/Resources/ADynamicResource.plist",
30773065
"Versions/A/Resources/Info.plist",
3078-
"Versions/A/_CodeSignature",
3079-
"Versions/A/_CodeSignature/CodeDirectory",
3080-
"Versions/A/_CodeSignature/CodeRequirements",
3081-
"Versions/A/_CodeSignature/CodeRequirements-1",
3082-
"Versions/A/_CodeSignature/CodeResources",
3083-
"Versions/A/_CodeSignature/CodeSignature",
30843066
"Versions/Current",
30853067
])
30863068
} else {
@@ -3090,8 +3072,6 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
30903072
"Headers",
30913073
"Headers/ADynamicFwk.h",
30923074
"Info.plist",
3093-
"_CodeSignature",
3094-
"_CodeSignature/CodeResources",
30953075
])
30963076
}
30973077

@@ -3111,7 +3091,7 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
31113091
]))
31123092
}
31133093

3114-
let sourceStaticFrameworkFiles = try tester.fs.traverse(sourceStaticFrameworkPath, { $0.relativeSubpath(from: sourceStaticFrameworkPath) }).sorted()
3094+
let sourceStaticFrameworkFiles = try tester.fs.traverse(sourceStaticFrameworkPath, { $0.relativeSubpath(from: sourceStaticFrameworkPath) }).sorted().filter { !$0.contains("_CodeSignature") }
31153095
if runDestination.platform == "macosx" {
31163096
XCTAssertEqualSequences(sourceStaticFrameworkFiles, [
31173097
"AStaticFwk",
@@ -3125,12 +3105,6 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
31253105
"Versions/A/Resources",
31263106
"Versions/A/Resources/AStaticResource.plist",
31273107
"Versions/A/Resources/Info.plist",
3128-
"Versions/A/_CodeSignature",
3129-
"Versions/A/_CodeSignature/CodeDirectory",
3130-
"Versions/A/_CodeSignature/CodeRequirements",
3131-
"Versions/A/_CodeSignature/CodeRequirements-1",
3132-
"Versions/A/_CodeSignature/CodeResources",
3133-
"Versions/A/_CodeSignature/CodeSignature",
31343108
"Versions/Current",
31353109
])
31363110
} else {
@@ -3140,12 +3114,6 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
31403114
"Headers",
31413115
"Headers/AStaticFwk.h",
31423116
"Info.plist",
3143-
"_CodeSignature",
3144-
"_CodeSignature/CodeDirectory",
3145-
"_CodeSignature/CodeRequirements",
3146-
"_CodeSignature/CodeRequirements-1",
3147-
"_CodeSignature/CodeResources",
3148-
"_CodeSignature/CodeSignature",
31493117
])
31503118
}
31513119

@@ -3199,7 +3167,7 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
31993167
task.checkCommandLine(["builtin-copy", "-exclude", ".DS_Store", "-exclude", "CVS", "-exclude", ".svn", "-exclude", ".git", "-exclude", ".hg", "-exclude", "Headers", "-exclude", "PrivateHeaders", "-exclude", "Modules", "-exclude", "*.tbd", "-resolve-src-symlinks"] + (keepStaticBinary ? [] : ["-remove-static-executable"]) + ["\(tmpDirPath.str)/ADynamicFwk.framework", frameworkDestinationDir])
32003168

32013169
let destDynamicFrameworkPath = Path("\(frameworkDestinationDir)/ADynamicFwk.framework")
3202-
let delta = try Set(sourceDynamicFrameworkFiles).diff(against: tester.fs.traverse(destDynamicFrameworkPath, { $0.relativeSubpath(from: destDynamicFrameworkPath) }))
3170+
let delta = try Set(sourceDynamicFrameworkFiles).diff(against: tester.fs.traverse(destDynamicFrameworkPath, { $0.relativeSubpath(from: destDynamicFrameworkPath) }).filter{ !$0.contains("_CodeSignature") })
32033171
XCTAssertEqualSequences(delta.right, [])
32043172

32053173
// Check that we removed all the headers
@@ -3221,7 +3189,7 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
32213189
task.checkCommandLine(["builtin-copy", "-exclude", ".DS_Store", "-exclude", "CVS", "-exclude", ".svn", "-exclude", ".git", "-exclude", ".hg", "-exclude", "Headers", "-exclude", "PrivateHeaders", "-exclude", "Modules", "-exclude", "*.tbd", "-resolve-src-symlinks"] + (keepStaticBinary ? [] : ["-remove-static-executable"]) + ["\(tmpDirPath.str)/AStaticFwk.framework", frameworkDestinationDir])
32223190

32233191
let destStaticFrameworkPath = Path("\(frameworkDestinationDir)/AStaticFwk.framework")
3224-
let delta = try Set(sourceStaticFrameworkFiles).diff(against: tester.fs.traverse(destStaticFrameworkPath, { $0.relativeSubpath(from: destStaticFrameworkPath) }))
3192+
let delta = try Set(sourceStaticFrameworkFiles).diff(against: tester.fs.traverse(destStaticFrameworkPath, { $0.relativeSubpath(from: destStaticFrameworkPath) }).filter{ !$0.contains("_CodeSignature") })
32253193
XCTAssertEqualSequences(delta.right, [])
32263194

32273195
// Check that we removed all the headers, as well as the binary (since it is static), if configured
@@ -3240,22 +3208,10 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
32403208
"Headers/AStaticFwk.h",
32413209
])
32423210
} else if useAppStoreCodelessFrameworksWorkaround {
3243-
let additionalFiles: [String]
3244-
if codesign {
3245-
additionalFiles = [
3246-
"_CodeSignature/CodeDirectory",
3247-
"_CodeSignature/CodeRequirements",
3248-
"_CodeSignature/CodeRequirements-1",
3249-
"_CodeSignature/CodeSignature",
3250-
]
3251-
} else {
3252-
additionalFiles = []
3253-
}
3254-
32553211
XCTAssertEqualSequences(delta.left.sorted(), [
32563212
"Headers",
32573213
"Headers/AStaticFwk.h",
3258-
] + additionalFiles)
3214+
])
32593215
} else {
32603216
XCTAssertEqualSequences(delta.left.sorted(), [
32613217
"AStaticFwk",

0 commit comments

Comments
 (0)