Remove UseAspectsForTestSuite option
Also sort the keys when building the shell script command,
this should make it stable.
PiperOrigin-RevId: 199134089
diff --git a/src/Tulsi/TulsiGeneratorConfigDocument.swift b/src/Tulsi/TulsiGeneratorConfigDocument.swift
index 304b55d..9bd1eed 100644
--- a/src/Tulsi/TulsiGeneratorConfigDocument.swift
+++ b/src/Tulsi/TulsiGeneratorConfigDocument.swift
@@ -460,12 +460,10 @@
do {
let startupOptions = optionSet[.BazelBuildStartupOptionsDebug]
let buildOptions = optionSet[.BazelBuildOptionsDebug]
- let useAspectForTestSuitesOption = optionSet[.UseAspectForTestSuites]
let projectGenBuildOptions = optionSet[.BazelBuildOptionsProjectGenerationOnly]
ruleEntryMap = try self.infoExtractor.ruleEntriesForLabels(selectedLabels,
startupOptions: startupOptions,
buildOptions: buildOptions,
- useAspectForTestSuitesOption: useAspectForTestSuitesOption,
projectGenBuildOptions: projectGenBuildOptions)
} catch TulsiProjectInfoExtractor.ExtractorError.ruleEntriesFailed(let info) {
LogMessage.postError("Label resolution failed: \(info)")
@@ -789,7 +787,6 @@
let ruleEntryMap = try infoExtractor.ruleEntriesForLabels(concreteBuildTargetLabels,
startupOptions: optionSet![.BazelBuildStartupOptionsDebug],
buildOptions: optionSet![.BazelBuildOptionsDebug],
- useAspectForTestSuitesOption: optionSet![.UseAspectForTestSuites],
projectGenBuildOptions: optionSet![.BazelBuildOptionsProjectGenerationOnly])
var unresolvedLabels = Set<BuildLabel>()
var ruleInfos = [UIRuleInfo]()
diff --git a/src/TulsiGenerator/BazelAspectInfoExtractor.swift b/src/TulsiGenerator/BazelAspectInfoExtractor.swift
index dcc1c11..f015136 100644
--- a/src/TulsiGenerator/BazelAspectInfoExtractor.swift
+++ b/src/TulsiGenerator/BazelAspectInfoExtractor.swift
@@ -68,7 +68,6 @@
func extractRuleEntriesForLabels(_ targets: [BuildLabel],
startupOptions: [String] = [],
buildOptions: [String] = [],
- useAspectForTestSuites: Bool = true,
projectGenerationOptions: [String] = []) throws -> RuleEntryMap {
guard !targets.isEmpty else {
return RuleEntryMap()
@@ -76,7 +75,6 @@
return try extractRuleEntriesUsingBEP(targets,
startupOptions: startupOptions,
buildOptions: buildOptions,
- useAspectForTestSuites: useAspectForTestSuites,
projectGenerationOptions: projectGenerationOptions)
}
@@ -85,7 +83,6 @@
private func extractRuleEntriesUsingBEP(_ targets: [BuildLabel],
startupOptions: [String],
buildOptions: [String],
- useAspectForTestSuites: Bool,
projectGenerationOptions: [String]) throws -> RuleEntryMap {
localizedMessageLogger.infoMessage("Build Events JSON file at \"\(buildEventsFilePath)\"")
@@ -104,7 +101,6 @@
aspect: "tulsi_sources_aspect",
startupOptions: startupOptions,
buildOptions: buildOptions,
- useAspectForTestSuites: useAspectForTestSuites,
projectGenerationOptions: projectGenerationOptions,
progressNotifier: progressNotifier) {
(process: Process, debugInfo: String) -> Void in
@@ -161,7 +157,6 @@
aspect: String,
startupOptions: [String] = [],
buildOptions: [String] = [],
- useAspectForTestSuites: Bool = true,
projectGenerationOptions: [String] = [],
progressNotifier: ProgressNotifier? = nil,
terminationHandler: @escaping CompletionHandler) -> Process? {
@@ -197,12 +192,10 @@
"--tool_tag=tulsi_v\(tulsiVersion):generator", // Add a tag for tracking.
"--build_event_json_file=\(self.buildEventsFilePath)",
"--noexperimental_build_event_json_file_path_conversion",
+ // Don't replace test_suites with their tests. This allows the Aspect to discover the
+ // structure of test_suites instead of just the tests they resolve to.
+ "--noexpand_test_suites",
])
- // Don't replace test_suites with their tests. This allows the Aspect to discover the structure
- // of the test_suite.
- if useAspectForTestSuites {
- arguments.append("--noexpand_test_suites")
- }
arguments.append(contentsOf: projectGenerationOptions)
arguments.append(contentsOf: buildOptions)
arguments.append(contentsOf: targets)
diff --git a/src/TulsiGenerator/BazelQueryInfoExtractor.swift b/src/TulsiGenerator/BazelQueryInfoExtractor.swift
index 5badd01..15f8b1a 100644
--- a/src/TulsiGenerator/BazelQueryInfoExtractor.swift
+++ b/src/TulsiGenerator/BazelQueryInfoExtractor.swift
@@ -68,39 +68,6 @@
return infos
}
- /// Extracts a map of RuleInfo to considered expansions for the given test_suite targets.
- // The information provided represents the full possible set of tests for each test_suite; the
- // actual expansion by Bazel may not include all of the returned labels and will be done
- // recursively such that a test_suite whose expansion contains another test_suite would expand to
- // the contents of the included suite.
- func extractTestSuiteRules(_ testSuiteLabels: [BuildLabel]) -> [RuleInfo: Set<BuildLabel>] {
- if testSuiteLabels.isEmpty { return [:] }
- let profilingStart = localizedMessageLogger.startProfiling("expand_test_suite_rules",
- message: "Expanding \(testSuiteLabels.count) test suites")
-
- var infos = [RuleInfo: Set<BuildLabel>]()
- let labelDeps = testSuiteLabels.map {"deps(\($0.value))"}
- let joinedLabelDeps = labelDeps.joined(separator: "+")
- let query = "kind(\"test_suite rule\",\(joinedLabelDeps))"
- do {
- let (_, data, _, debugInfo) = try self.bazelSynchronousQueryProcess(query,
- outputKind: "xml",
- additionalArguments: ["--keep_going"],
- loggingIdentifier: "bazel_query_expand_test_suite_rules")
- if let entries = self.extractRuleInfosWithRuleInputsFromBazelXMLOutput(data) {
- infos = entries
- }
- // Note that this query is expected to return a non-zero exit code on occasion, so messages
- // should be handled as [Info]s, not errors.
- self.queuedInfoMessages.append(debugInfo)
- localizedMessageLogger.logProfilingEnd(profilingStart)
- } catch {
- // The error has already been displayed to the user.
- return [:]
- }
- return infos
- }
-
/// Extracts all of the transitive BUILD and skylark (.bzl) files used by the given targets.
func extractBuildfiles<T: Collection>(_ targets: T) -> Set<BuildLabel> where T.Iterator.Element == BuildLabel {
if targets.isEmpty { return Set() }
diff --git a/src/TulsiGenerator/BazelWorkspaceInfoExtractor.swift b/src/TulsiGenerator/BazelWorkspaceInfoExtractor.swift
index cc1e0ff..bd9ac19 100644
--- a/src/TulsiGenerator/BazelWorkspaceInfoExtractor.swift
+++ b/src/TulsiGenerator/BazelWorkspaceInfoExtractor.swift
@@ -44,8 +44,6 @@
// Cache of all RuleEntry instances loaded for the associated project.
private var ruleEntryCache = RuleEntryMap()
- // The set of labels for which a test_suite query has been run (to prevent duplicate queries).
- private var attemptedTestSuiteLabels = Set<BuildLabel>()
init(bazelURL: URL, workspaceRootURL: URL, localizedMessageLogger: LocalizedMessageLogger) {
@@ -69,7 +67,6 @@
func ruleEntriesForLabels(_ labels: [BuildLabel],
startupOptions: TulsiOption,
buildOptions: TulsiOption,
- useAspectForTestSuitesOption: TulsiOption,
projectGenBuildOptions: TulsiOption) throws -> RuleEntryMap {
func isLabelMissing(_ label: BuildLabel) -> Bool {
return !ruleEntryCache.hasAnyRuleEntry(withBuildLabel: label)
@@ -85,7 +82,6 @@
let startupOptions = splitOptionString(startupOptions.commonValue)
let buildOptions = splitOptionString(buildOptions.commonValue)
- let useAspectForTestSuites = useAspectForTestSuitesOption.commonValueAsBool ?? true
let projectGenerationOptions = splitOptionString(projectGenBuildOptions.commonValue)
do {
@@ -93,29 +89,12 @@
try aspectExtractor.extractRuleEntriesForLabels(labels,
startupOptions: startupOptions,
buildOptions: buildOptions,
- useAspectForTestSuites: useAspectForTestSuites,
projectGenerationOptions: projectGenerationOptions)
ruleEntryCache = RuleEntryMap(ruleEntryMap)
} catch BazelAspectInfoExtractor.ExtractorError.buildFailed {
throw BazelWorkspaceInfoExtractorError.aspectExtractorFailed("Bazel aspects could not be built.")
}
- // If we use fetch the test_suites from the Aspect, no further work is needed.
- guard !useAspectForTestSuites else {
- return ruleEntryCache
- }
-
- // Because certain label types are expanded by Bazel prior to aspect invocation (most notably
- // test_suite rules), an additional pass is attempted if any of the requested labels are still
- // missing after the aspect run.
- let remainingMissingLabels = missingLabels.filter() {
- return isLabelMissing($0) && !attemptedTestSuiteLabels.contains($0)
- }
- if !remainingMissingLabels.isEmpty {
- extractTestSuiteRules(remainingMissingLabels)
- attemptedTestSuiteLabels.forEach() { attemptedTestSuiteLabels.insert($0) }
- }
-
return ruleEntryCache
}
@@ -131,16 +110,4 @@
func hasQueuedInfoMessages() -> Bool {
return aspectExtractor.hasQueuedInfoMessages || queryExtractor.hasQueuedInfoMessages
}
-
- // MARK: - Private methods
-
- private func extractTestSuiteRules(_ labels: [BuildLabel]) {
- let testSuiteDependencies = queryExtractor.extractTestSuiteRules(labels)
- for (ruleInfo, possibleExpansions) in testSuiteDependencies {
- ruleEntryCache.insert(ruleEntry: RuleEntry(label: ruleInfo.label,
- type: ruleInfo.type,
- attributes: [:],
- weakDependencies: possibleExpansions))
- }
- }
}
diff --git a/src/TulsiGenerator/BazelWorkspaceInfoExtractorProtocol.swift b/src/TulsiGenerator/BazelWorkspaceInfoExtractorProtocol.swift
index 57b06f0..0b7925a 100644
--- a/src/TulsiGenerator/BazelWorkspaceInfoExtractorProtocol.swift
+++ b/src/TulsiGenerator/BazelWorkspaceInfoExtractorProtocol.swift
@@ -29,7 +29,6 @@
func ruleEntriesForLabels(_ labels: [BuildLabel],
startupOptions: TulsiOption,
buildOptions: TulsiOption,
- useAspectForTestSuitesOption: TulsiOption,
projectGenBuildOptions: TulsiOption) throws -> RuleEntryMap
/// Extracts labels for the files referenced by the build infrastructure for the given set of
diff --git a/src/TulsiGenerator/PBXTargetGenerator.swift b/src/TulsiGenerator/PBXTargetGenerator.swift
index e1490e4..91cbfeb 100644
--- a/src/TulsiGenerator/PBXTargetGenerator.swift
+++ b/src/TulsiGenerator/PBXTargetGenerator.swift
@@ -1629,7 +1629,9 @@
}
// Emit a filtered option (--optionName[configName]) for each config.
- for (optionKey, value) in configValues {
+ // Note that we sort the keys to make sure the ordering is stable even when adding/removing
+ // other keys.
+ for (optionKey, value) in configValues.sorted(by: { $0.0.rawValue < $1.0.rawValue }) {
guard let concreteValue = value else { continue }
let rawName = optionKey.rawValue
var configKey: String?
diff --git a/src/TulsiGenerator/TulsiOptionSet.swift b/src/TulsiGenerator/TulsiOptionSet.swift
index 4d538aa..7946711 100644
--- a/src/TulsiGenerator/TulsiOptionSet.swift
+++ b/src/TulsiGenerator/TulsiOptionSet.swift
@@ -43,9 +43,6 @@
// Include all .bzl files related to the build in the generated Xcodeproj.
IncludeBuildSources,
- // Configures test_suite targets based using bazel aspects instead of bazel query.
- UseAspectForTestSuites,
-
// Explicitly turns off all actions around caching paths for dSYM in a local SQLite database.
DisableDBGShellCommandsCaching,
@@ -282,7 +279,6 @@
addBoolOption(.ALWAYS_SEARCH_USER_PATHS, .BuildSetting, false)
addBoolOption(.BazelContinueBuildingAfterError, .Generic, false)
- addBoolOption(.UseAspectForTestSuites, .Generic, true)
addBoolOption(.DisableDBGShellCommandsCaching, .Generic, false)
addBoolOption(.DisableNormalizedDebugPrefixMap, .Generic, false)
addStringOption(.BazelBuildOptionsProjectGenerationOnly, .Generic)
diff --git a/src/TulsiGenerator/TulsiProjectInfoExtractor.swift b/src/TulsiGenerator/TulsiProjectInfoExtractor.swift
index f1ea2ad..5ed4823 100644
--- a/src/TulsiGenerator/TulsiProjectInfoExtractor.swift
+++ b/src/TulsiGenerator/TulsiProjectInfoExtractor.swift
@@ -47,25 +47,21 @@
public func ruleEntriesForInfos(_ infos: [RuleInfo],
startupOptions: TulsiOption,
buildOptions: TulsiOption,
- useAspectForTestSuitesOption: TulsiOption,
projectGenBuildOptions: TulsiOption) throws -> RuleEntryMap {
return try ruleEntriesForLabels(infos.map({ $0.label }),
startupOptions: startupOptions,
buildOptions: buildOptions,
- useAspectForTestSuitesOption: useAspectForTestSuitesOption,
projectGenBuildOptions: projectGenBuildOptions)
}
public func ruleEntriesForLabels(_ labels: [BuildLabel],
startupOptions: TulsiOption,
buildOptions: TulsiOption,
- useAspectForTestSuitesOption: TulsiOption,
projectGenBuildOptions: TulsiOption) throws -> RuleEntryMap {
do {
return try workspaceInfoExtractor.ruleEntriesForLabels(labels,
startupOptions: startupOptions,
buildOptions: buildOptions,
- useAspectForTestSuitesOption: useAspectForTestSuitesOption,
projectGenBuildOptions: projectGenBuildOptions)
} catch BazelWorkspaceInfoExtractorError.aspectExtractorFailed(let info) {
throw ExtractorError.ruleEntriesFailed(info)
diff --git a/src/TulsiGenerator/XcodeProjectGenerator.swift b/src/TulsiGenerator/XcodeProjectGenerator.swift
index 7599634..06b0c8c 100644
--- a/src/TulsiGenerator/XcodeProjectGenerator.swift
+++ b/src/TulsiGenerator/XcodeProjectGenerator.swift
@@ -596,7 +596,6 @@
return try workspaceInfoExtractor.ruleEntriesForLabels(config.buildTargetLabels,
startupOptions: config.options[.BazelBuildStartupOptionsDebug],
buildOptions: config.options[.BazelBuildOptionsDebug],
- useAspectForTestSuitesOption: config.options[.UseAspectForTestSuites],
projectGenBuildOptions: config.options[.BazelBuildOptionsProjectGenerationOnly])
} catch BazelWorkspaceInfoExtractorError.aspectExtractorFailed(let info) {
throw ProjectGeneratorError.labelAspectFailure(info)
diff --git a/src/TulsiGenerator/en.lproj/Options.strings b/src/TulsiGenerator/en.lproj/Options.strings
index 6e37c54..88f8570 100644
--- a/src/TulsiGenerator/en.lproj/Options.strings
+++ b/src/TulsiGenerator/en.lproj/Options.strings
@@ -25,9 +25,6 @@
"BazelContinueBuildingAfterError" = "Continue building after error";
-"UseAspectForTestSuites" = "Expand test_suites via an aspect instead of bazel query.";
-"UseAspectForTestSuites_DESC" = "Requires a Bazel which supports --noexpand_test_suites";
-
"DisableDBGShellCommandsCaching" = "Disable DBGShellCommands caching of dSYM bundles.";
"DisableDBGShellCommandsCaching_DESC" = "Explicitly turns off all actions surrounding caching paths for dSYM bundles in a local SQLite database.";
diff --git a/src/TulsiGeneratorIntegrationTests/AspectTests.swift b/src/TulsiGeneratorIntegrationTests/AspectTests.swift
index cc648fa..76f6cab 100644
--- a/src/TulsiGeneratorIntegrationTests/AspectTests.swift
+++ b/src/TulsiGeneratorIntegrationTests/AspectTests.swift
@@ -534,35 +534,19 @@
fromResourceDirectory: "TestSuite/Three")
}
- func testTestSuite_ExplicitXCTests_Query() throws {
+ func testTestSuite_ExplicitXCTests() throws {
let ruleEntryMap = try aspectInfoExtractor.extractRuleEntriesForLabels([BuildLabel("//\(testDir):explicit_XCTests")],
startupOptions: bazelStartupOptions,
- buildOptions: bazelBuildOptions,
- useAspectForTestSuites: false)
- XCTAssertEqual(ruleEntryMap.allRuleEntries.count, 23)
- let checker = InfoChecker(ruleEntryMap: ruleEntryMap)
-
- checker.assertThat("//\(testDir)/One:XCTest")
- .hasTestHost("//\(testDir):TestApplication")
- checker.assertThat("//\(testDir)/One:LogicTest")
- .exists()
- checker.assertThat("//\(testDir)/Two:XCTest")
- .hasTestHost("//\(testDir):TestApplication")
- checker.assertThat("//\(testDir)/Three:XCTest")
- .hasTestHost("//\(testDir):TestApplication")
-
- }
-
- func testTestSuite_ExplicitXCTests_Aspect() throws {
- let ruleEntryMap = try aspectInfoExtractor.extractRuleEntriesForLabels([BuildLabel("//\(testDir):explicit_XCTests")],
- startupOptions: bazelStartupOptions,
- buildOptions: bazelBuildOptions,
- useAspectForTestSuites: true)
+ buildOptions: bazelBuildOptions)
XCTAssertEqual(ruleEntryMap.allRuleEntries.count, 24)
let checker = InfoChecker(ruleEntryMap: ruleEntryMap)
checker.assertThat("//\(testDir):explicit_XCTests")
.hasType("test_suite")
+ .dependsOn("//\(testDir)/One:XCTest")
+ .dependsOn("//\(testDir)/One:LogicTest")
+ .dependsOn("//\(testDir)/Two:XCTest")
+ .dependsOn("//\(testDir)/Three:XCTest")
checker.assertThat("//\(testDir)/One:XCTest")
.hasTestHost("//\(testDir):TestApplication")
checker.assertThat("//\(testDir)/One:LogicTest")
@@ -575,26 +559,16 @@
}
- func testTestSuite_TaggedTests_Query() throws {
+ func testTestSuite_TaggedTests() throws {
let ruleEntryMap = try aspectInfoExtractor.extractRuleEntriesForLabels([BuildLabel("//\(testDir):local_tagged_tests")],
startupOptions: bazelStartupOptions,
- buildOptions: bazelBuildOptions,
- useAspectForTestSuites: false)
- XCTAssertEqual(ruleEntryMap.allRuleEntries.count, 10)
- let checker = InfoChecker(ruleEntryMap: ruleEntryMap)
-
- checker.assertThat("//\(testDir):TestSuiteXCTest")
- .hasTestHost("//\(testDir):TestApplication")
- }
-
- func testTestSuite_TaggedTests_Aspect() throws {
- let ruleEntryMap = try aspectInfoExtractor.extractRuleEntriesForLabels([BuildLabel("//\(testDir):local_tagged_tests")],
- startupOptions: bazelStartupOptions,
- buildOptions: bazelBuildOptions,
- useAspectForTestSuites: true)
+ buildOptions: bazelBuildOptions)
XCTAssertEqual(ruleEntryMap.allRuleEntries.count, 11)
let checker = InfoChecker(ruleEntryMap: ruleEntryMap)
+ checker.assertThat("//\(testDir):local_tagged_tests")
+ .hasType("test_suite")
+ .dependsOn("//\(testDir):TestSuiteXCTest")
checker.assertThat("//\(testDir):TestSuiteXCTest")
.hasTestHost("//\(testDir):TestApplication")
}
diff --git a/src/TulsiGeneratorIntegrationTests/EndToEndGenerationTests.swift b/src/TulsiGeneratorIntegrationTests/EndToEndGenerationTests.swift
index 4ffbfa2..f0bbca9 100644
--- a/src/TulsiGeneratorIntegrationTests/EndToEndGenerationTests.swift
+++ b/src/TulsiGeneratorIntegrationTests/EndToEndGenerationTests.swift
@@ -374,7 +374,6 @@
let projectName = "TestSuiteLocalTaggedTestsProject"
let options = TulsiOptionSet()
- options.options[.UseAspectForTestSuites]?.projectValue = "NO"
let projectURL = try generateProjectNamed(projectName,
buildTargets: buildTargets,
pathFilters: ["\(testDir)/..."],
@@ -396,7 +395,6 @@
let projectName = "TestSuiteRecursiveTestSuiteProject"
let options = TulsiOptionSet()
- options.options[.UseAspectForTestSuites]?.projectValue = "NO"
let projectURL = try generateProjectNamed(projectName,
buildTargets: buildTargets,
pathFilters: ["\(testDir)/..."],
diff --git a/src/TulsiGeneratorIntegrationTests/QueryTests.swift b/src/TulsiGeneratorIntegrationTests/QueryTests.swift
index aea8023..5cf72f0 100644
--- a/src/TulsiGeneratorIntegrationTests/QueryTests.swift
+++ b/src/TulsiGeneratorIntegrationTests/QueryTests.swift
@@ -156,84 +156,6 @@
}
-// Tests for test_suite support.
-class QueryTests_TestSuiteExtraction: BazelIntegrationTestCase {
- var infoExtractor: BazelQueryInfoExtractor! = nil
- let testDir = "TestSuite"
-
- override func setUp() {
- super.setUp()
- infoExtractor = BazelQueryInfoExtractor(bazelURL: bazelURL,
- workspaceRootURL: workspaceRootURL!,
- localizedMessageLogger: localizedMessageLogger)
- installBUILDFile("TestSuiteRoot",
- intoSubdirectory: testDir,
- fromResourceDirectory: "TestSuite")
- installBUILDFile("TestOne",
- intoSubdirectory: "\(testDir)/One",
- fromResourceDirectory: "TestSuite/One")
- installBUILDFile("TestTwo",
- intoSubdirectory: "\(testDir)/Two",
- fromResourceDirectory: "TestSuite/Two")
- installBUILDFile("TestThree",
- intoSubdirectory: "\(testDir)/Three",
- fromResourceDirectory: "TestSuite/Three")
- }
-
- func testTestSuite_ExplicitXCTests() {
- let infos = infoExtractor.extractTestSuiteRules([BuildLabel("//\(testDir):explicit_XCTests")])
- XCTAssertEqual(infos.count, 1)
- XCTAssert(infoExtractor.hasQueuedInfoMessages)
- let checker = InfoChecker(infos: infos)
-
- checker.assertThat("//\(testDir):explicit_XCTests")
- .hasType("test_suite")
- .hasNoLinkedTargetLabels()
- .hasDependencies(["//\(testDir)/One:XCTest",
- "//\(testDir)/One:LogicTest",
- "//\(testDir)/Two:XCTest",
- "//\(testDir)/Three:XCTest"])
- }
-
- func testTestSuite_LocalTaggedTests() {
- let infos = infoExtractor.extractTestSuiteRules([BuildLabel("//\(testDir):local_tagged_tests")])
- XCTAssertEqual(infos.count, 1)
- XCTAssert(infoExtractor.hasQueuedInfoMessages)
- let checker = InfoChecker(infos: infos)
-
- // Tagged tests are expected to return all *_test rules in the same package, regardless of the
- // actual tagging.
- checker.assertThat("//\(testDir):local_tagged_tests")
- .hasType("test_suite")
- .hasNoLinkedTargetLabels()
- .hasDependencies(["//\(testDir):TestSuiteXCTest",
- "//\(testDir):TestSuiteXCTestNotTagged"])
- }
-
- func testTestSuite_RecursiveTestSuites() {
- let infos = infoExtractor.extractTestSuiteRules([BuildLabel("//\(testDir):recursive_test_suite")])
- XCTAssertEqual(infos.count, 2)
- XCTAssert(infoExtractor.hasQueuedInfoMessages)
- let checker = InfoChecker(infos: infos)
-
- checker.assertThat("//\(testDir):recursive_test_suite")
- .hasType("test_suite")
- .hasNoLinkedTargetLabels()
- .hasDependencies(["//\(testDir):TestSuiteXCTest",
- "//\(testDir)/Three:tagged_tests"])
-
- // Tagged tests are expected to return all *_test rules in the same package, regardless of the
- // actual tagging.
- checker.assertThat("//\(testDir)/Three:tagged_tests")
- .hasType("test_suite")
- .hasNoLinkedTargetLabels()
- .hasDependencies(["//\(testDir)/Three:XCTest",
- "//\(testDir)/Three:tagged_xctest_1",
- "//\(testDir)/Three:tagged_xctest_2"])
- }
-}
-
-
// Tests for buildfiles extraction.
class QueryTests_BuildFilesExtraction: BazelIntegrationTestCase {
var infoExtractor: BazelQueryInfoExtractor! = nil
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/ComplexSingleProject.xcodeproj/project.pbxproj b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/ComplexSingleProject.xcodeproj/project.pbxproj
index 0d3b9cf..c289cba 100644
--- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/ComplexSingleProject.xcodeproj/project.pbxproj
+++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/ComplexSingleProject.xcodeproj/project.pbxproj
@@ -491,7 +491,7 @@
isa = PBXNativeTarget;
buildConfigurationList = DE4755839DDBAE2300000000 /* Build configuration list for PBXNativeTarget "TodayExtension" */;
buildPhases = (
- 84B422713D11618A00000000 /* ShellScript */,
+ 84B42271EDFA8BDF00000000 /* ShellScript */,
);
buildRules = (
);
@@ -558,7 +558,7 @@
isa = PBXNativeTarget;
buildConfigurationList = DE475583F843F89400000000 /* Build configuration list for PBXNativeTarget "Application" */;
buildPhases = (
- 84B42271B7AF6C1E00000000 /* ShellScript */,
+ 84B422719191909A00000000 /* ShellScript */,
);
buildRules = (
);
@@ -609,7 +609,7 @@
isa = PBXNativeTarget;
buildConfigurationList = DE475583B2A6125600000000 /* Build configuration list for PBXNativeTarget "XCTest" */;
buildPhases = (
- 84B42271A423309300000000 /* ShellScript */,
+ 84B4227112F47D1700000000 /* ShellScript */,
605793E20000000000000000 /* Sources */,
);
buildRules = (
@@ -677,7 +677,7 @@
/* End PBXProject section */
/* Begin PBXShellScriptBuildPhase section */
- 84B422713D11618A00000000 /* ShellScript */ = {
+ 84B4227112F47D1700000000 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 0;
files = (
@@ -688,10 +688,10 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/bash;
- shellScript = "set -e\ncd \"${SRCROOT}/..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //tulsi_e2e_complex:TodayExtension --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"bazel-bin\" --verbose --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_startup_options[Debug] --bazelrc=/dev/null -- ";
+ shellScript = "set -e\ncd \"${SRCROOT}/..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //tulsi_e2e_complex:XCTest --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"bazel-bin\" --verbose --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_startup_options[Debug] --bazelrc=/dev/null -- ";
showEnvVarsInLog = 1;
};
- 84B42271A423309300000000 /* ShellScript */ = {
+ 84B422719191909A00000000 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 0;
files = (
@@ -702,10 +702,10 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/bash;
- shellScript = "set -e\ncd \"${SRCROOT}/..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //tulsi_e2e_complex:XCTest --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"bazel-bin\" --verbose --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_startup_options[Debug] --bazelrc=/dev/null -- ";
+ shellScript = "set -e\ncd \"${SRCROOT}/..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //tulsi_e2e_complex:Application --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"bazel-bin\" --verbose --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_startup_options[Debug] --bazelrc=/dev/null -- ";
showEnvVarsInLog = 1;
};
- 84B42271B7AF6C1E00000000 /* ShellScript */ = {
+ 84B42271EDFA8BDF00000000 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 0;
files = (
@@ -716,7 +716,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/bash;
- shellScript = "set -e\ncd \"${SRCROOT}/..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //tulsi_e2e_complex:Application --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"bazel-bin\" --verbose --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_startup_options[Debug] --bazelrc=/dev/null -- ";
+ shellScript = "set -e\ncd \"${SRCROOT}/..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //tulsi_e2e_complex:TodayExtension --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"bazel-bin\" --verbose --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_startup_options[Debug] --bazelrc=/dev/null -- ";
showEnvVarsInLog = 1;
};
/* End PBXShellScriptBuildPhase section */
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/IosLegacyTestProject.xcodeproj/project.pbxproj b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/IosLegacyTestProject.xcodeproj/project.pbxproj
index 291cf8c..27d913b 100644
--- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/IosLegacyTestProject.xcodeproj/project.pbxproj
+++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/IosLegacyTestProject.xcodeproj/project.pbxproj
@@ -145,7 +145,7 @@
isa = PBXNativeTarget;
buildConfigurationList = DE4755838B7B6C8800000000 /* Build configuration list for PBXNativeTarget "LegacyTests" */;
buildPhases = (
- 84B42271AEA1377100000000 /* ShellScript */,
+ 84B42271A6BA3E3D00000000 /* ShellScript */,
);
buildRules = (
);
@@ -183,7 +183,7 @@
/* End PBXProject section */
/* Begin PBXShellScriptBuildPhase section */
- 84B42271AEA1377100000000 /* ShellScript */ = {
+ 84B42271A6BA3E3D00000000 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 0;
files = (
@@ -194,7 +194,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/bash;
- shellScript = "set -e\ncd \"${SRCROOT}/..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //tulsi_e2e_ios_legacy_test:LegacyTests --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"bazel-bin\" --verbose --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_startup_options[Debug] --bazelrc=/dev/null -- ";
+ shellScript = "set -e\ncd \"${SRCROOT}/..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //tulsi_e2e_ios_legacy_test:LegacyTests --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"bazel-bin\" --verbose --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_startup_options[Debug] --bazelrc=/dev/null -- ";
showEnvVarsInLog = 1;
};
/* End PBXShellScriptBuildPhase section */
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/MacOSProject.xcodeproj/project.pbxproj b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/MacOSProject.xcodeproj/project.pbxproj
index 5bc4966..4b6002c 100644
--- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/MacOSProject.xcodeproj/project.pbxproj
+++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/MacOSProject.xcodeproj/project.pbxproj
@@ -206,7 +206,7 @@
isa = PBXNativeTarget;
buildConfigurationList = DE4755832C9B8E5500000000 /* Build configuration list for PBXNativeTarget "MyCommandLineApp" */;
buildPhases = (
- 84B42271A17F2F5500000000 /* ShellScript */,
+ 84B422711507A0A200000000 /* ShellScript */,
);
buildRules = (
);
@@ -222,7 +222,7 @@
isa = PBXNativeTarget;
buildConfigurationList = DE4755839935C7EB00000000 /* Build configuration list for PBXNativeTarget "MyTodayExtension" */;
buildPhases = (
- 84B42271A17F2F5500000001 /* ShellScript */,
+ 84B422711507A0A200000001 /* ShellScript */,
);
buildRules = (
);
@@ -238,7 +238,7 @@
isa = PBXNativeTarget;
buildConfigurationList = DE47558336864DFB00000000 /* Build configuration list for PBXNativeTarget "MyMacOSApp" */;
buildPhases = (
- 84B42271A423309300000000 /* ShellScript */,
+ 84B4227112F47D1700000000 /* ShellScript */,
);
buildRules = (
);
@@ -294,7 +294,7 @@
/* End PBXProject section */
/* Begin PBXShellScriptBuildPhase section */
- 84B42271A17F2F5500000000 /* ShellScript */ = {
+ 84B4227112F47D1700000000 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 0;
files = (
@@ -305,10 +305,10 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/bash;
- shellScript = "set -e\ncd \"${SRCROOT}/..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //tulsi_e2e_mac:MyCommandLineApp --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"bazel-bin\" --verbose --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_startup_options[Debug] --bazelrc=/dev/null -- ";
+ shellScript = "set -e\ncd \"${SRCROOT}/..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //tulsi_e2e_mac:MyMacOSApp --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"bazel-bin\" --verbose --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_startup_options[Debug] --bazelrc=/dev/null -- ";
showEnvVarsInLog = 1;
};
- 84B42271A17F2F5500000001 /* ShellScript */ = {
+ 84B422711507A0A200000000 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 0;
files = (
@@ -319,10 +319,10 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/bash;
- shellScript = "set -e\ncd \"${SRCROOT}/..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //tulsi_e2e_mac:MyTodayExtension --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"bazel-bin\" --verbose --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_startup_options[Debug] --bazelrc=/dev/null -- ";
+ shellScript = "set -e\ncd \"${SRCROOT}/..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //tulsi_e2e_mac:MyCommandLineApp --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"bazel-bin\" --verbose --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_startup_options[Debug] --bazelrc=/dev/null -- ";
showEnvVarsInLog = 1;
};
- 84B42271A423309300000000 /* ShellScript */ = {
+ 84B422711507A0A200000001 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 0;
files = (
@@ -333,7 +333,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/bash;
- shellScript = "set -e\ncd \"${SRCROOT}/..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //tulsi_e2e_mac:MyMacOSApp --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"bazel-bin\" --verbose --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_startup_options[Debug] --bazelrc=/dev/null -- ";
+ shellScript = "set -e\ncd \"${SRCROOT}/..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //tulsi_e2e_mac:MyTodayExtension --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"bazel-bin\" --verbose --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_startup_options[Debug] --bazelrc=/dev/null -- ";
showEnvVarsInLog = 1;
};
/* End PBXShellScriptBuildPhase section */
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/MacOSTestsProject.xcodeproj/project.pbxproj b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/MacOSTestsProject.xcodeproj/project.pbxproj
index fd2647d..cf5b0b6 100644
--- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/MacOSTestsProject.xcodeproj/project.pbxproj
+++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/MacOSTestsProject.xcodeproj/project.pbxproj
@@ -237,7 +237,7 @@
isa = PBXNativeTarget;
buildConfigurationList = DE47558302B841D300000000 /* Build configuration list for PBXNativeTarget "UnitTests" */;
buildPhases = (
- 84B42271A1C3A15500000000 /* ShellScript */,
+ 84B422711BCD09D600000000 /* ShellScript */,
605793E20000000000000000 /* Sources */,
);
buildRules = (
@@ -255,7 +255,7 @@
isa = PBXNativeTarget;
buildConfigurationList = DE4755836E46667200000000 /* Build configuration list for PBXNativeTarget "UnitTestsNoHost" */;
buildPhases = (
- 84B42271B7AF6C1E00000000 /* ShellScript */,
+ 84B422719191909A00000000 /* ShellScript */,
605793E20000000000000002 /* Sources */,
);
buildRules = (
@@ -288,7 +288,7 @@
isa = PBXNativeTarget;
buildConfigurationList = DE475583737127CF00000000 /* Build configuration list for PBXNativeTarget "UITests" */;
buildPhases = (
- 84B422713D81DD1600000000 /* ShellScript */,
+ 84B42271C1E6048E00000000 /* ShellScript */,
605793E20000000000000001 /* Sources */,
);
buildRules = (
@@ -322,7 +322,7 @@
isa = PBXNativeTarget;
buildConfigurationList = DE47558336864DFB00000000 /* Build configuration list for PBXNativeTarget "MyMacOSApp" */;
buildPhases = (
- 84B42271A423309300000000 /* ShellScript */,
+ 84B4227112F47D1700000000 /* ShellScript */,
);
buildRules = (
);
@@ -372,7 +372,7 @@
/* End PBXProject section */
/* Begin PBXShellScriptBuildPhase section */
- 84B422713D81DD1600000000 /* ShellScript */ = {
+ 84B4227112F47D1700000000 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 0;
files = (
@@ -383,10 +383,10 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/bash;
- shellScript = "set -e\ncd \"${SRCROOT}/..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //tulsi_e2e_mac:UITests --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"bazel-bin\" --verbose --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_startup_options[Debug] --bazelrc=/dev/null -- ";
+ shellScript = "set -e\ncd \"${SRCROOT}/..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //tulsi_e2e_mac:MyMacOSApp --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"bazel-bin\" --verbose --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_startup_options[Debug] --bazelrc=/dev/null -- ";
showEnvVarsInLog = 1;
};
- 84B42271A1C3A15500000000 /* ShellScript */ = {
+ 84B422711BCD09D600000000 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 0;
files = (
@@ -397,10 +397,10 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/bash;
- shellScript = "set -e\ncd \"${SRCROOT}/..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //tulsi_e2e_mac:UnitTests --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"bazel-bin\" --verbose --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_startup_options[Debug] --bazelrc=/dev/null -- ";
+ shellScript = "set -e\ncd \"${SRCROOT}/..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //tulsi_e2e_mac:UnitTests --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"bazel-bin\" --verbose --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_startup_options[Debug] --bazelrc=/dev/null -- ";
showEnvVarsInLog = 1;
};
- 84B42271A423309300000000 /* ShellScript */ = {
+ 84B422719191909A00000000 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 0;
files = (
@@ -411,10 +411,10 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/bash;
- shellScript = "set -e\ncd \"${SRCROOT}/..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //tulsi_e2e_mac:MyMacOSApp --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"bazel-bin\" --verbose --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_startup_options[Debug] --bazelrc=/dev/null -- ";
+ shellScript = "set -e\ncd \"${SRCROOT}/..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //tulsi_e2e_mac:UnitTestsNoHost --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"bazel-bin\" --verbose --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_startup_options[Debug] --bazelrc=/dev/null -- ";
showEnvVarsInLog = 1;
};
- 84B42271B7AF6C1E00000000 /* ShellScript */ = {
+ 84B42271C1E6048E00000000 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 0;
files = (
@@ -425,7 +425,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/bash;
- shellScript = "set -e\ncd \"${SRCROOT}/..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //tulsi_e2e_mac:UnitTestsNoHost --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"bazel-bin\" --verbose --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_startup_options[Debug] --bazelrc=/dev/null -- ";
+ shellScript = "set -e\ncd \"${SRCROOT}/..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //tulsi_e2e_mac:UITests --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"bazel-bin\" --verbose --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_startup_options[Debug] --bazelrc=/dev/null -- ";
showEnvVarsInLog = 1;
};
/* End PBXShellScriptBuildPhase section */
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleCCProject.xcodeproj/project.pbxproj b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleCCProject.xcodeproj/project.pbxproj
index 373866d..0ba58bb 100644
--- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleCCProject.xcodeproj/project.pbxproj
+++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleCCProject.xcodeproj/project.pbxproj
@@ -153,7 +153,7 @@
isa = PBXNativeTarget;
buildConfigurationList = DE475583130F2B4800000000 /* Build configuration list for PBXNativeTarget "ccBinary" */;
buildPhases = (
- 84B42271AA7880DD00000000 /* ShellScript */,
+ 84B42271BE3E215900000000 /* ShellScript */,
);
buildRules = (
);
@@ -191,7 +191,7 @@
/* End PBXProject section */
/* Begin PBXShellScriptBuildPhase section */
- 84B42271AA7880DD00000000 /* ShellScript */ = {
+ 84B42271BE3E215900000000 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 0;
files = (
@@ -202,7 +202,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/bash;
- shellScript = "set -e\ncd \"${SRCROOT}/..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //tulsi_e2e_ccsimple:ccBinary --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"bazel-bin\" --verbose --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_startup_options[Debug] --bazelrc=/dev/null -- ";
+ shellScript = "set -e\ncd \"${SRCROOT}/..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //tulsi_e2e_ccsimple:ccBinary --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"bazel-bin\" --verbose --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_startup_options[Debug] --bazelrc=/dev/null -- ";
showEnvVarsInLog = 1;
};
/* End PBXShellScriptBuildPhase section */
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleProject.xcodeproj/project.pbxproj b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleProject.xcodeproj/project.pbxproj
index 312717d..1e253ee 100644
--- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleProject.xcodeproj/project.pbxproj
+++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleProject.xcodeproj/project.pbxproj
@@ -298,7 +298,7 @@
isa = PBXNativeTarget;
buildConfigurationList = DE475583978C206500000000 /* Build configuration list for PBXNativeTarget "TargetApplication" */;
buildPhases = (
- 84B4227103C55B9800000000 /* ShellScript */,
+ 84B42271826D930E00000000 /* ShellScript */,
);
buildRules = (
);
@@ -331,7 +331,7 @@
isa = PBXNativeTarget;
buildConfigurationList = DE475583F843F89400000000 /* Build configuration list for PBXNativeTarget "Application" */;
buildPhases = (
- 84B422715895915900000000 /* ShellScript */,
+ 84B42271C9411DCB00000000 /* ShellScript */,
);
buildRules = (
);
@@ -380,7 +380,7 @@
isa = PBXNativeTarget;
buildConfigurationList = DE475583B2A6125600000000 /* Build configuration list for PBXNativeTarget "XCTest" */;
buildPhases = (
- 84B42271DD3B007B00000000 /* ShellScript */,
+ 84B42271CC70386D00000000 /* ShellScript */,
605793E20000000000000000 /* Sources */,
);
buildRules = (
@@ -429,7 +429,7 @@
/* End PBXProject section */
/* Begin PBXShellScriptBuildPhase section */
- 84B4227103C55B9800000000 /* ShellScript */ = {
+ 84B42271826D930E00000000 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 0;
files = (
@@ -440,10 +440,10 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/bash;
- shellScript = "set -e\ncd \"${SRCROOT}/..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //tulsi_e2e_simple:TargetApplication --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"bazel-bin\" --verbose --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 --keep_going -- --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 --keep_going -- --bazel_startup_options[Debug] --bazelrc=/dev/null -- ";
+ shellScript = "set -e\ncd \"${SRCROOT}/..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //tulsi_e2e_simple:TargetApplication --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"bazel-bin\" --verbose --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 --keep_going -- --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 --keep_going -- --bazel_startup_options[Debug] --bazelrc=/dev/null -- ";
showEnvVarsInLog = 1;
};
- 84B422715895915900000000 /* ShellScript */ = {
+ 84B42271C9411DCB00000000 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 0;
files = (
@@ -454,10 +454,10 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/bash;
- shellScript = "set -e\ncd \"${SRCROOT}/..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //tulsi_e2e_simple:Application --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"bazel-bin\" --verbose --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 --keep_going -- --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 --keep_going -- --bazel_startup_options[Debug] --bazelrc=/dev/null -- ";
+ shellScript = "set -e\ncd \"${SRCROOT}/..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //tulsi_e2e_simple:Application --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"bazel-bin\" --verbose --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 --keep_going -- --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 --keep_going -- --bazel_startup_options[Debug] --bazelrc=/dev/null -- ";
showEnvVarsInLog = 1;
};
- 84B42271DD3B007B00000000 /* ShellScript */ = {
+ 84B42271CC70386D00000000 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 0;
files = (
@@ -468,7 +468,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/bash;
- shellScript = "set -e\ncd \"${SRCROOT}/..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //tulsi_e2e_simple:XCTest --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"bazel-bin\" --verbose --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 --keep_going -- --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 --keep_going -- --bazel_startup_options[Debug] --bazelrc=/dev/null -- ";
+ shellScript = "set -e\ncd \"${SRCROOT}/..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //tulsi_e2e_simple:XCTest --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"bazel-bin\" --verbose --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 --keep_going -- --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 --keep_going -- --bazel_startup_options[Debug] --bazelrc=/dev/null -- ";
showEnvVarsInLog = 1;
};
/* End PBXShellScriptBuildPhase section */
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleSkylarkProject.xcodeproj/project.pbxproj b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleSkylarkProject.xcodeproj/project.pbxproj
index 9c59123..d4014bb 100644
--- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleSkylarkProject.xcodeproj/project.pbxproj
+++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleSkylarkProject.xcodeproj/project.pbxproj
@@ -425,7 +425,7 @@
isa = PBXNativeTarget;
buildConfigurationList = DE475583903428F900000000 /* Build configuration list for PBXNativeTarget "StickerExtension" */;
buildPhases = (
- 84B422716594BCCE00000000 /* ShellScript */,
+ 84B4227188CD951200000000 /* ShellScript */,
);
buildRules = (
);
@@ -441,7 +441,7 @@
isa = PBXNativeTarget;
buildConfigurationList = DE4755837696EE3600000000 /* Build configuration list for PBXNativeTarget "XCUITest" */;
buildPhases = (
- 84B42271A75833CE00000000 /* ShellScript */,
+ 84B42271CEE7712000000000 /* ShellScript */,
605793E20000000000000000 /* Sources */,
);
buildRules = (
@@ -459,7 +459,7 @@
isa = PBXNativeTarget;
buildConfigurationList = DE475583218595F600000000 /* Build configuration list for PBXNativeTarget "SkylarkApplication" */;
buildPhases = (
- 84B422711DBEAC9E00000000 /* ShellScript */,
+ 84B42271CC32BF6800000000 /* ShellScript */,
);
buildRules = (
);
@@ -475,7 +475,7 @@
isa = PBXNativeTarget;
buildConfigurationList = DE475583B2A6125600000000 /* Build configuration list for PBXNativeTarget "XCTest" */;
buildPhases = (
- 84B4227138DE730900000000 /* ShellScript */,
+ 84B422715611829000000000 /* ShellScript */,
84B42271B548D02D00000000 /* ShellScript */,
605793E20000000000000001 /* Sources */,
);
@@ -494,7 +494,7 @@
isa = PBXNativeTarget;
buildConfigurationList = DE4755835CC0E52B00000000 /* Build configuration list for PBXNativeTarget "SkylarkTargetApplication" */;
buildPhases = (
- 84B4227137AAB58900000000 /* ShellScript */,
+ 84B422717B92420A00000000 /* ShellScript */,
);
buildRules = (
);
@@ -548,7 +548,7 @@
/* End PBXProject section */
/* Begin PBXShellScriptBuildPhase section */
- 84B422711DBEAC9E00000000 /* ShellScript */ = {
+ 84B422715611829000000000 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 0;
files = (
@@ -559,10 +559,10 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/bash;
- shellScript = "set -e\ncd \"${SRCROOT}/..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //tulsi_e2e_simple_skylark:SkylarkApplication --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"bazel-bin\" --verbose --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 --keep_going -- --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 --keep_going -- --bazel_startup_options[Debug] --bazelrc=/dev/null -- ";
+ shellScript = "set -e\ncd \"${SRCROOT}/..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //tulsi_e2e_simple_skylark:XCTest --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"bazel-bin\" --verbose --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 --keep_going -- --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 --keep_going -- --bazel_startup_options[Debug] --bazelrc=/dev/null -- ";
showEnvVarsInLog = 1;
};
- 84B4227137AAB58900000000 /* ShellScript */ = {
+ 84B422717B92420A00000000 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 0;
files = (
@@ -573,10 +573,10 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/bash;
- shellScript = "set -e\ncd \"${SRCROOT}/..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //tulsi_e2e_simple_skylark:SkylarkTargetApplication --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"bazel-bin\" --verbose --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 --keep_going -- --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 --keep_going -- --bazel_startup_options[Debug] --bazelrc=/dev/null -- ";
+ shellScript = "set -e\ncd \"${SRCROOT}/..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //tulsi_e2e_simple_skylark:SkylarkTargetApplication --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"bazel-bin\" --verbose --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 --keep_going -- --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 --keep_going -- --bazel_startup_options[Debug] --bazelrc=/dev/null -- ";
showEnvVarsInLog = 1;
};
- 84B4227138DE730900000000 /* ShellScript */ = {
+ 84B4227188CD951200000000 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 0;
files = (
@@ -587,35 +587,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/bash;
- shellScript = "set -e\ncd \"${SRCROOT}/..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //tulsi_e2e_simple_skylark:XCTest --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"bazel-bin\" --verbose --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 --keep_going -- --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 --keep_going -- --bazel_startup_options[Debug] --bazelrc=/dev/null -- ";
- showEnvVarsInLog = 1;
- };
- 84B422716594BCCE00000000 /* ShellScript */ = {
- isa = PBXShellScriptBuildPhase;
- buildActionMask = 0;
- files = (
- );
- inputPaths = (
- );
- outputPaths = (
- );
- runOnlyForDeploymentPostprocessing = 0;
- shellPath = /bin/bash;
- shellScript = "set -e\ncd \"${SRCROOT}/..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //tulsi_e2e_simple_skylark:StickerExtension --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"bazel-bin\" --verbose --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 --keep_going -- --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 --keep_going -- --bazel_startup_options[Debug] --bazelrc=/dev/null -- ";
- showEnvVarsInLog = 1;
- };
- 84B42271A75833CE00000000 /* ShellScript */ = {
- isa = PBXShellScriptBuildPhase;
- buildActionMask = 0;
- files = (
- );
- inputPaths = (
- );
- outputPaths = (
- );
- runOnlyForDeploymentPostprocessing = 0;
- shellPath = /bin/bash;
- shellScript = "set -e\ncd \"${SRCROOT}/..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //tulsi_e2e_simple_skylark:XCUITest --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"bazel-bin\" --verbose --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 --keep_going -- --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 --keep_going -- --bazel_startup_options[Debug] --bazelrc=/dev/null -- ";
+ shellScript = "set -e\ncd \"${SRCROOT}/..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //tulsi_e2e_simple_skylark:StickerExtension --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"bazel-bin\" --verbose --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 --keep_going -- --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 --keep_going -- --bazel_startup_options[Debug] --bazelrc=/dev/null -- ";
showEnvVarsInLog = 1;
};
84B42271B548D02D00000000 /* ShellScript */ = {
@@ -632,6 +604,34 @@
shellScript = "# Script to generate specific Swift files Xcode expects when running tests.\nset -eu\nARCH_ARRAY=($ARCHS)\nSUFFIXES=(swiftdoc swiftmodule)\nfor ARCH in \"${ARCH_ARRAY[@]}\"\ndo\n touch \"$OBJECT_FILE_DIR_normal/$ARCH/$SWIFT_OBJC_INTERFACE_HEADER_NAME\"\n for SUFFIX in \"${SUFFIXES[@]}\"\n do\n touch \"$OBJECT_FILE_DIR_normal/$ARCH/$PRODUCT_MODULE_NAME.$SUFFIX\"\n done\ndone\n";
showEnvVarsInLog = 1;
};
+ 84B42271CC32BF6800000000 /* ShellScript */ = {
+ isa = PBXShellScriptBuildPhase;
+ buildActionMask = 0;
+ files = (
+ );
+ inputPaths = (
+ );
+ outputPaths = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ shellPath = /bin/bash;
+ shellScript = "set -e\ncd \"${SRCROOT}/..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //tulsi_e2e_simple_skylark:SkylarkApplication --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"bazel-bin\" --verbose --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 --keep_going -- --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 --keep_going -- --bazel_startup_options[Debug] --bazelrc=/dev/null -- ";
+ showEnvVarsInLog = 1;
+ };
+ 84B42271CEE7712000000000 /* ShellScript */ = {
+ isa = PBXShellScriptBuildPhase;
+ buildActionMask = 0;
+ files = (
+ );
+ inputPaths = (
+ );
+ outputPaths = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ shellPath = /bin/bash;
+ shellScript = "set -e\ncd \"${SRCROOT}/..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //tulsi_e2e_simple_skylark:XCUITest --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"bazel-bin\" --verbose --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 --keep_going -- --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 --keep_going -- --bazel_startup_options[Debug] --bazelrc=/dev/null -- ";
+ showEnvVarsInLog = 1;
+ };
/* End PBXShellScriptBuildPhase section */
/* Begin PBXSourcesBuildPhase section */
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SwiftProject.xcodeproj/project.pbxproj b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SwiftProject.xcodeproj/project.pbxproj
index 0949648..98d7dee 100644
--- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SwiftProject.xcodeproj/project.pbxproj
+++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SwiftProject.xcodeproj/project.pbxproj
@@ -206,7 +206,7 @@
isa = PBXNativeTarget;
buildConfigurationList = DE475583F843F89400000000 /* Build configuration list for PBXNativeTarget "Application" */;
buildPhases = (
- 84B42271AA7880DD00000000 /* ShellScript */,
+ 84B42271BE3E215900000000 /* ShellScript */,
);
buildRules = (
);
@@ -278,7 +278,7 @@
/* End PBXProject section */
/* Begin PBXShellScriptBuildPhase section */
- 84B42271AA7880DD00000000 /* ShellScript */ = {
+ 84B42271BE3E215900000000 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 0;
files = (
@@ -289,7 +289,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/bash;
- shellScript = "set -e\ncd \"${SRCROOT}/..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //tulsi_e2e_swift:Application --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"bazel-bin\" --verbose --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_startup_options[Debug] --bazelrc=/dev/null -- ";
+ shellScript = "set -e\ncd \"${SRCROOT}/..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //tulsi_e2e_swift:Application --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"bazel-bin\" --verbose --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_startup_options[Debug] --bazelrc=/dev/null -- ";
showEnvVarsInLog = 1;
};
/* End PBXShellScriptBuildPhase section */
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteExplicitXCTestsProject.xcodeproj/project.pbxproj b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteExplicitXCTestsProject.xcodeproj/project.pbxproj
index 3cdf7fe..93feec1 100644
--- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteExplicitXCTestsProject.xcodeproj/project.pbxproj
+++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteExplicitXCTestsProject.xcodeproj/project.pbxproj
@@ -261,7 +261,7 @@
isa = PBXNativeTarget;
buildConfigurationList = DE47558391D6432200000000 /* Build configuration list for PBXNativeTarget "TestSuite-One-XCTest" */;
buildPhases = (
- 84B422712E09FD1300000000 /* ShellScript */,
+ 84B42271F62EA48B00000000 /* ShellScript */,
605793E20000000000000000 /* Sources */,
);
buildRules = (
@@ -279,7 +279,7 @@
isa = PBXNativeTarget;
buildConfigurationList = DE4755834E80A3C200000000 /* Build configuration list for PBXNativeTarget "TestSuite-Three-XCTest" */;
buildPhases = (
- 84B422715CD3C15600000000 /* ShellScript */,
+ 84B42271E67D29D300000000 /* ShellScript */,
605793E20000000000000002 /* Sources */,
);
buildRules = (
@@ -297,7 +297,7 @@
isa = PBXNativeTarget;
buildConfigurationList = DE47558341AF1CEC00000000 /* Build configuration list for PBXNativeTarget "LogicTest" */;
buildPhases = (
- 84B42271A1C3A15500000000 /* ShellScript */,
+ 84B422711BCD09D600000000 /* ShellScript */,
605793E20000000000000003 /* Sources */,
);
buildRules = (
@@ -314,7 +314,7 @@
isa = PBXNativeTarget;
buildConfigurationList = DE4755831AEA36FA00000000 /* Build configuration list for PBXNativeTarget "TestSuite-Two-XCTest" */;
buildPhases = (
- 84B422712E09FD1300000001 /* ShellScript */,
+ 84B42271F62EA48B00000001 /* ShellScript */,
605793E20000000000000001 /* Sources */,
);
buildRules = (
@@ -332,7 +332,7 @@
isa = PBXNativeTarget;
buildConfigurationList = DE47558305B5AF7800000000 /* Build configuration list for PBXNativeTarget "TestApplication" */;
buildPhases = (
- 84B4227180D3109600000000 /* ShellScript */,
+ 84B4227131E45D1A00000000 /* ShellScript */,
);
buildRules = (
);
@@ -401,7 +401,7 @@
/* End PBXProject section */
/* Begin PBXShellScriptBuildPhase section */
- 84B422712E09FD1300000000 /* ShellScript */ = {
+ 84B422711BCD09D600000000 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 0;
files = (
@@ -412,10 +412,10 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/bash;
- shellScript = "set -e\ncd \"${SRCROOT}/..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //TestSuite/One:XCTest --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"bazel-bin\" --verbose --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_startup_options[Debug] --bazelrc=/dev/null -- ";
+ shellScript = "set -e\ncd \"${SRCROOT}/..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //TestSuite/One:LogicTest --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"bazel-bin\" --verbose --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_startup_options[Debug] --bazelrc=/dev/null -- ";
showEnvVarsInLog = 1;
};
- 84B422712E09FD1300000001 /* ShellScript */ = {
+ 84B4227131E45D1A00000000 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 0;
files = (
@@ -426,10 +426,10 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/bash;
- shellScript = "set -e\ncd \"${SRCROOT}/..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //TestSuite/Two:XCTest --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"bazel-bin\" --verbose --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_startup_options[Debug] --bazelrc=/dev/null -- ";
+ shellScript = "set -e\ncd \"${SRCROOT}/..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //TestSuite:TestApplication --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"bazel-bin\" --verbose --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_startup_options[Debug] --bazelrc=/dev/null -- ";
showEnvVarsInLog = 1;
};
- 84B422715CD3C15600000000 /* ShellScript */ = {
+ 84B42271E67D29D300000000 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 0;
files = (
@@ -440,10 +440,10 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/bash;
- shellScript = "set -e\ncd \"${SRCROOT}/..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //TestSuite/Three:XCTest --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"bazel-bin\" --verbose --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_startup_options[Debug] --bazelrc=/dev/null -- ";
+ shellScript = "set -e\ncd \"${SRCROOT}/..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //TestSuite/Three:XCTest --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"bazel-bin\" --verbose --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_startup_options[Debug] --bazelrc=/dev/null -- ";
showEnvVarsInLog = 1;
};
- 84B4227180D3109600000000 /* ShellScript */ = {
+ 84B42271F62EA48B00000000 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 0;
files = (
@@ -454,10 +454,10 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/bash;
- shellScript = "set -e\ncd \"${SRCROOT}/..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //TestSuite:TestApplication --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"bazel-bin\" --verbose --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_startup_options[Debug] --bazelrc=/dev/null -- ";
+ shellScript = "set -e\ncd \"${SRCROOT}/..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //TestSuite/One:XCTest --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"bazel-bin\" --verbose --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_startup_options[Debug] --bazelrc=/dev/null -- ";
showEnvVarsInLog = 1;
};
- 84B42271A1C3A15500000000 /* ShellScript */ = {
+ 84B42271F62EA48B00000001 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 0;
files = (
@@ -468,7 +468,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/bash;
- shellScript = "set -e\ncd \"${SRCROOT}/..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //TestSuite/One:LogicTest --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"bazel-bin\" --verbose --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_startup_options[Debug] --bazelrc=/dev/null -- ";
+ shellScript = "set -e\ncd \"${SRCROOT}/..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //TestSuite/Two:XCTest --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"bazel-bin\" --verbose --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_startup_options[Debug] --bazelrc=/dev/null -- ";
showEnvVarsInLog = 1;
};
/* End PBXShellScriptBuildPhase section */
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteLocalTaggedTestsProject.xcodeproj/project.pbxproj b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteLocalTaggedTestsProject.xcodeproj/project.pbxproj
index 22953bb..7f79ac7 100644
--- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteLocalTaggedTestsProject.xcodeproj/project.pbxproj
+++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteLocalTaggedTestsProject.xcodeproj/project.pbxproj
@@ -188,7 +188,7 @@
isa = PBXNativeTarget;
buildConfigurationList = DE47558395C0260B00000000 /* Build configuration list for PBXNativeTarget "TestSuiteXCTest" */;
buildPhases = (
- 84B4227180D3109600000000 /* ShellScript */,
+ 84B4227131E45D1A00000000 /* ShellScript */,
605793E20000000000000000 /* Sources */,
);
buildRules = (
@@ -222,7 +222,7 @@
isa = PBXNativeTarget;
buildConfigurationList = DE47558305B5AF7800000000 /* Build configuration list for PBXNativeTarget "TestApplication" */;
buildPhases = (
- 84B4227180D3109600000001 /* ShellScript */,
+ 84B4227131E45D1A00000001 /* ShellScript */,
);
buildRules = (
);
@@ -266,7 +266,7 @@
/* End PBXProject section */
/* Begin PBXShellScriptBuildPhase section */
- 84B4227180D3109600000000 /* ShellScript */ = {
+ 84B4227131E45D1A00000000 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 0;
files = (
@@ -277,10 +277,10 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/bash;
- shellScript = "set -e\ncd \"${SRCROOT}/..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //TestSuite:TestSuiteXCTest --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"bazel-bin\" --verbose --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_startup_options[Debug] --bazelrc=/dev/null -- ";
+ shellScript = "set -e\ncd \"${SRCROOT}/..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //TestSuite:TestSuiteXCTest --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"bazel-bin\" --verbose --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_startup_options[Debug] --bazelrc=/dev/null -- ";
showEnvVarsInLog = 1;
};
- 84B4227180D3109600000001 /* ShellScript */ = {
+ 84B4227131E45D1A00000001 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 0;
files = (
@@ -291,7 +291,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/bash;
- shellScript = "set -e\ncd \"${SRCROOT}/..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //TestSuite:TestApplication --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"bazel-bin\" --verbose --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_startup_options[Debug] --bazelrc=/dev/null -- ";
+ shellScript = "set -e\ncd \"${SRCROOT}/..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //TestSuite:TestApplication --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"bazel-bin\" --verbose --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_startup_options[Debug] --bazelrc=/dev/null -- ";
showEnvVarsInLog = 1;
};
/* End PBXShellScriptBuildPhase section */
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteRecursiveTestSuiteProject.xcodeproj/project.pbxproj b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteRecursiveTestSuiteProject.xcodeproj/project.pbxproj
index 7f90e3b..942be9d 100644
--- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteRecursiveTestSuiteProject.xcodeproj/project.pbxproj
+++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteRecursiveTestSuiteProject.xcodeproj/project.pbxproj
@@ -224,7 +224,7 @@
isa = PBXNativeTarget;
buildConfigurationList = DE47558395C0260B00000000 /* Build configuration list for PBXNativeTarget "TestSuiteXCTest" */;
buildPhases = (
- 84B4227180D3109600000000 /* ShellScript */,
+ 84B4227131E45D1A00000000 /* ShellScript */,
605793E20000000000000000 /* Sources */,
);
buildRules = (
@@ -242,7 +242,7 @@
isa = PBXNativeTarget;
buildConfigurationList = DE475583CC86731D00000000 /* Build configuration list for PBXNativeTarget "tagged_xctest_2" */;
buildPhases = (
- 84B42271F3EF0F5800000000 /* ShellScript */,
+ 84B42271C53300A100000000 /* ShellScript */,
605793E20000000000000001 /* Sources */,
);
buildRules = (
@@ -260,7 +260,7 @@
isa = PBXNativeTarget;
buildConfigurationList = DE4755838C86721A00000000 /* Build configuration list for PBXNativeTarget "tagged_xctest_1" */;
buildPhases = (
- 84B42271F3EF0F5800000001 /* ShellScript */,
+ 84B42271C53300A100000001 /* ShellScript */,
605793E20000000000000002 /* Sources */,
);
buildRules = (
@@ -294,7 +294,7 @@
isa = PBXNativeTarget;
buildConfigurationList = DE47558305B5AF7800000000 /* Build configuration list for PBXNativeTarget "TestApplication" */;
buildPhases = (
- 84B4227180D3109600000001 /* ShellScript */,
+ 84B4227131E45D1A00000001 /* ShellScript */,
);
buildRules = (
);
@@ -346,7 +346,7 @@
/* End PBXProject section */
/* Begin PBXShellScriptBuildPhase section */
- 84B4227180D3109600000000 /* ShellScript */ = {
+ 84B4227131E45D1A00000000 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 0;
files = (
@@ -357,10 +357,10 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/bash;
- shellScript = "set -e\ncd \"${SRCROOT}/..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //TestSuite:TestSuiteXCTest --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"bazel-bin\" --verbose --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_startup_options[Debug] --bazelrc=/dev/null -- ";
+ shellScript = "set -e\ncd \"${SRCROOT}/..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //TestSuite:TestSuiteXCTest --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"bazel-bin\" --verbose --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_startup_options[Debug] --bazelrc=/dev/null -- ";
showEnvVarsInLog = 1;
};
- 84B4227180D3109600000001 /* ShellScript */ = {
+ 84B4227131E45D1A00000001 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 0;
files = (
@@ -371,10 +371,10 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/bash;
- shellScript = "set -e\ncd \"${SRCROOT}/..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //TestSuite:TestApplication --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"bazel-bin\" --verbose --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_startup_options[Debug] --bazelrc=/dev/null -- ";
+ shellScript = "set -e\ncd \"${SRCROOT}/..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //TestSuite:TestApplication --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"bazel-bin\" --verbose --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_startup_options[Debug] --bazelrc=/dev/null -- ";
showEnvVarsInLog = 1;
};
- 84B42271F3EF0F5800000000 /* ShellScript */ = {
+ 84B42271C53300A100000000 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 0;
files = (
@@ -385,10 +385,10 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/bash;
- shellScript = "set -e\ncd \"${SRCROOT}/..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //TestSuite/Three:tagged_xctest_2 --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"bazel-bin\" --verbose --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_startup_options[Debug] --bazelrc=/dev/null -- ";
+ shellScript = "set -e\ncd \"${SRCROOT}/..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //TestSuite/Three:tagged_xctest_2 --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"bazel-bin\" --verbose --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_startup_options[Debug] --bazelrc=/dev/null -- ";
showEnvVarsInLog = 1;
};
- 84B42271F3EF0F5800000001 /* ShellScript */ = {
+ 84B42271C53300A100000001 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 0;
files = (
@@ -399,7 +399,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/bash;
- shellScript = "set -e\ncd \"${SRCROOT}/..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //TestSuite/Three:tagged_xctest_1 --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"bazel-bin\" --verbose --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_startup_options[Debug] --bazelrc=/dev/null -- ";
+ shellScript = "set -e\ncd \"${SRCROOT}/..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //TestSuite/Three:tagged_xctest_1 --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"bazel-bin\" --verbose --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_startup_options[Debug] --bazelrc=/dev/null -- ";
showEnvVarsInLog = 1;
};
/* End PBXShellScriptBuildPhase section */
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/WatchProject.xcodeproj/project.pbxproj b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/WatchProject.xcodeproj/project.pbxproj
index 2f3894f..f306726 100644
--- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/WatchProject.xcodeproj/project.pbxproj
+++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/WatchProject.xcodeproj/project.pbxproj
@@ -238,7 +238,7 @@
isa = PBXNativeTarget;
buildConfigurationList = DE4755834598A69000000000 /* Build configuration list for PBXNativeTarget "WatchApplication" */;
buildPhases = (
- 84B422713D11618A00000000 /* ShellScript */,
+ 84B42271EDFA8BDF00000000 /* ShellScript */,
);
buildRules = (
);
@@ -255,7 +255,7 @@
isa = PBXNativeTarget;
buildConfigurationList = DE475583F843F89400000000 /* Build configuration list for PBXNativeTarget "Application" */;
buildPhases = (
- 84B42271AA7880DD00000000 /* ShellScript */,
+ 84B42271BE3E215900000000 /* ShellScript */,
);
buildRules = (
);
@@ -287,7 +287,7 @@
isa = PBXNativeTarget;
buildConfigurationList = DE4755830DB9CDD900000000 /* Build configuration list for PBXNativeTarget "WatchExtension" */;
buildPhases = (
- 84B42271A17F2F5500000000 /* ShellScript */,
+ 84B422711507A0A200000000 /* ShellScript */,
);
buildRules = (
);
@@ -328,7 +328,7 @@
/* End PBXProject section */
/* Begin PBXShellScriptBuildPhase section */
- 84B422713D11618A00000000 /* ShellScript */ = {
+ 84B422711507A0A200000000 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 0;
files = (
@@ -339,10 +339,10 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/bash;
- shellScript = "set -e\ncd \"${SRCROOT}/..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //tulsi_e2e_watch:WatchApplication --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"bazel-bin\" --verbose --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_startup_options[Debug] --bazelrc=/dev/null -- ";
+ shellScript = "set -e\ncd \"${SRCROOT}/..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //tulsi_e2e_watch:WatchExtension --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"bazel-bin\" --verbose --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_startup_options[Debug] --bazelrc=/dev/null -- ";
showEnvVarsInLog = 1;
};
- 84B42271A17F2F5500000000 /* ShellScript */ = {
+ 84B42271BE3E215900000000 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 0;
files = (
@@ -353,10 +353,10 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/bash;
- shellScript = "set -e\ncd \"${SRCROOT}/..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //tulsi_e2e_watch:WatchExtension --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"bazel-bin\" --verbose --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_startup_options[Debug] --bazelrc=/dev/null -- ";
+ shellScript = "set -e\ncd \"${SRCROOT}/..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //tulsi_e2e_watch:Application --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"bazel-bin\" --verbose --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_startup_options[Debug] --bazelrc=/dev/null -- ";
showEnvVarsInLog = 1;
};
- 84B42271AA7880DD00000000 /* ShellScript */ = {
+ 84B42271EDFA8BDF00000000 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 0;
files = (
@@ -367,7 +367,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/bash;
- shellScript = "set -e\ncd \"${SRCROOT}/..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //tulsi_e2e_watch:Application --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"bazel-bin\" --verbose --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_startup_options[Debug] --bazelrc=/dev/null -- ";
+ shellScript = "set -e\ncd \"${SRCROOT}/..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //tulsi_e2e_watch:WatchApplication --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"bazel-bin\" --verbose --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --xcode_version=9.2 -- --bazel_startup_options[Debug] --bazelrc=/dev/null -- ";
showEnvVarsInLog = 1;
};
/* End PBXShellScriptBuildPhase section */
diff --git a/src/TulsiGeneratorTests/MockWorkspaceInfoExtractor.swift b/src/TulsiGeneratorTests/MockWorkspaceInfoExtractor.swift
index 6e85011..c0f8271 100644
--- a/src/TulsiGeneratorTests/MockWorkspaceInfoExtractor.swift
+++ b/src/TulsiGeneratorTests/MockWorkspaceInfoExtractor.swift
@@ -34,7 +34,6 @@
func ruleEntriesForLabels(_ labels: [BuildLabel],
startupOptions: TulsiOption,
buildOptions: TulsiOption,
- useAspectForTestSuitesOption: TulsiOption,
projectGenBuildOptions: TulsiOption) throws -> RuleEntryMap {
invalidLabels.removeAll(keepingCapacity: true)
let ret = RuleEntryMap()
