Fix xctool tests running under Xcode 7.3.

facebookarchive · Apr 11, 2016 · db4c065 · db4c065
1 parent 2cd7a65
commit db4c065
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 8 deletions.
diff --git a/xctool/xctool-tests/OCUnitTestRunnerTests.m b/xctool/xctool-tests/OCUnitTestRunnerTests.m
@@ -95,6 +95,11 @@ @interface OCUnitTestRunnerTests : XCTestCase
 
 @implementation OCUnitTestRunnerTests
 
++ (void)setUp
+{
+  [SimulatorInfo prepare];
+}
+
 #pragma mark iOS Tests
 
 - (void)runTestsForRunner:(OCUnitTestRunner *)runner andReturnLaunchOptions:(NSDictionary **)outOptions

diff --git a/xctool/xctool-tests/OTestQueryTests.m b/xctool/xctool-tests/OTestQueryTests.m
@@ -43,6 +43,11 @@ @interface OTestQueryTests : XCTestCase
 
 @implementation OTestQueryTests
 
++ (void)setUp
+{
+  [SimulatorInfo prepare];
+}
+
 - (void)testCanQueryClassesFromOSXBundle
 {
   if (ToolchainIsXcode7OrBetter()) {

diff --git a/xctool/xctool-tests/OTestShimTests.m b/xctool/xctool-tests/OTestShimTests.m
@@ -228,6 +228,11 @@ @interface OTestShimTests : XCTestCase
 
 @implementation OTestShimTests
 
++ (void)setUp
+{
+  [SimulatorInfo prepare];
+}
+
 - (void)testSenTestingKitAssertionFailuresInIOSLogicTestsAreNotSilent
 {
   if (ToolchainIsXcode7OrBetter()) {

diff --git a/xctool/xctool-tests/RunTestsActionTests.m b/xctool/xctool-tests/RunTestsActionTests.m
@@ -65,11 +65,6 @@ @interface RunTestsActionTests : XCTestCase
 
 @implementation RunTestsActionTests
 
-- (void)setUp
-{
-  [super setUp];
-}
-
 - (void)testTestSDKIsCollected
 {
   Options *options = [[Options optionsFrom:@[

diff --git a/...tool-tests/TestData/TestProject-TVFramework-TestProject-TVFramework-showBuildSettings.txt b/...tool-tests/TestData/TestProject-TVFramework-TestProject-TVFramework-showBuildSettings.txt
@@ -283,8 +283,8 @@ Build settings for action build and target TestProjectTVFramework:
     REZ_OBJECTS_DIR = /Users/nekto/Library/Developer/Xcode/DerivedData/TestProject-TVFramework-eioarvrojappukbxcyfncxozpvso/Build/Intermediates/TestProject-TVFramework.build/Release-appletvsimulator/TestProjectTVFramework.build/ResourceManagerResources/Objects
     SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = NO
     SCRIPTS_FOLDER_PATH = TestProjectTVFramework.framework/Scripts
-    SDKROOT = /Applications/Xcode.app/Contents/Developer/Platforms/AppleTVSimulator.platform/Developer/SDKs/AppleTVSimulator9.1.sdk
-    SDK_DIR = /Applications/Xcode.app/Contents/Developer/Platforms/AppleTVSimulator.platform/Developer/SDKs/AppleTVSimulator9.1.sdk
+    SDKROOT = /Applications/Xcode.app/Contents/Developer/Platforms/AppleTVSimulator.platform/Developer/SDKs/AppleTVSimulator.sdk
+    SDK_DIR = /Applications/Xcode.app/Contents/Developer/Platforms/AppleTVSimulator.platform/Developer/SDKs/AppleTVSimulator.sdk
     SDK_DIR_appletvsimulator9_1 = /Applications/Xcode.app/Contents/Developer/Platforms/AppleTVSimulator.platform/Developer/SDKs/AppleTVSimulator9.1.sdk
     SDK_NAME = appletvsimulator9.1
     SDK_NAMES = appletvsimulator9.1

diff --git a/...tests/TestData/TestProject-TVFramework-TestProject-TVFrameworkTests-showBuildSettings.txt b/...tests/TestData/TestProject-TVFramework-TestProject-TVFrameworkTests-showBuildSettings.txt
@@ -279,7 +279,7 @@ Build settings for action build and target TestProject-TVFrameworkTests:
     REZ_OBJECTS_DIR = /Users/nekto/Library/Developer/Xcode/DerivedData/TestProject-TVFramework-eioarvrojappukbxcyfncxozpvso/Build/Intermediates/TestProject-TVFramework.build/Release-appletvsimulator/TestProject-TVFrameworkTests.build/ResourceManagerResources/Objects
     SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = NO
     SCRIPTS_FOLDER_PATH = TestProject-TVFrameworkTests.xctest/Scripts
-    SDKROOT = /Applications/Xcode.app/Contents/Developer/Platforms/AppleTVSimulator.platform/Developer/SDKs/AppleTVSimulator9.1.sdk
+    SDKROOT = /Applications/Xcode.app/Contents/Developer/Platforms/AppleTVSimulator.platform/Developer/SDKs/AppleTVSimulator.sdk
     SDK_DIR = /Applications/Xcode.app/Contents/Developer/Platforms/AppleTVSimulator.platform/Developer/SDKs/AppleTVSimulator9.1.sdk
     SDK_DIR_appletvsimulator9_1 = /Applications/Xcode.app/Contents/Developer/Platforms/AppleTVSimulator.platform/Developer/SDKs/AppleTVSimulator9.1.sdk
     SDK_NAME = appletvsimulator9.1