From 720d15281d7b147fad732f175f0081abbc0792e5 Mon Sep 17 00:00:00 2001
From: Fred Potter <fpotter@fb.com>
Date: Mon, 25 Nov 2013 23:16:47 -0800
Subject: [PATCH] fixing
 testTestSpecifierIsAllWhenRunningAllTestsInApplicationTestBundle

This test was only passing for me because the build settings file (from
my local machine) happened to refer to a path that existed on my local
machine.

Let's commit the TEST_HOST binary so it can pass on Travis CI, too.
---
 xctool/xctool-tests/OCUnitTestRunnerTests.m   |  11 ++++++-----
 .../Contents/Info.plist                       |   6 +++---
 .../Contents/MacOS/TestProject-App-OSX        | Bin 15288 -> 15288 bytes
 .../Contents/Info.plist                       |   6 +++---
 .../Contents/MacOS/TestProject-App-OSXTests   | Bin 16216 -> 16216 bytes
 5 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/xctool/xctool-tests/OCUnitTestRunnerTests.m b/xctool/xctool-tests/OCUnitTestRunnerTests.m
index ee0d323b3..39d19e910 100644
--- a/xctool/xctool-tests/OCUnitTestRunnerTests.m
+++ b/xctool/xctool-tests/OCUnitTestRunnerTests.m
@@ -12,6 +12,7 @@
 #import "OCUnitOSXLogicTestRunner.h"
 #import "OCUnitIOSAppTestRunner.h"
 #import "OCUnitIOSLogicTestRunner.h"
+#import "OCUnitTestQueryRunner.h"
 #import "ReporterEvents.h"
 #import "SimulatorLauncher.h"
 #import "Swizzler.h"
@@ -313,11 +314,11 @@ - (void)testTestSpecifierIsSelfWhenRunningAllTestsInLogicTestBundle
 
 - (void)testTestSpecifierIsAllWhenRunningAllTestsInApplicationTestBundle
 {
-  NSDictionary *allSettings =
-  BuildSettingsFromOutput([NSString stringWithContentsOfFile:TEST_DATA @"OSX-Application-Test-showBuildSettings.txt"
-                                                    encoding:NSUTF8StringEncoding
-                                                       error:nil]);
-  NSDictionary *testSettings = allSettings[@"TestProject-App-OSXTests"];
+  NSDictionary *testSettings = @{kBuiltProductsDir : AbsolutePathFromRelative(TEST_DATA @"TestProject-App-OSX/Build/Products/Debug/"),
+                                 kFullProductName : @"TestProject-App-OSXTests.octest",
+                                 kSdkName : GetAvailableSDKsAndAliases()[@"macosx"],
+                                 kTestHost : AbsolutePathFromRelative(TEST_DATA @"TestProject-App-OSX/Build/Products/Debug/TestProject-App-OSX.app/Contents/MacOS/TestProject-App-OSX"),
+                                  };
 
   OCUnitTestRunner *runner = TestRunnerWithTestList([OCUnitTestRunner class], testSettings, @[@"Cls1/testA", @"Cls2/testB"]);
 
diff --git a/xctool/xctool-tests/TestData/TestProject-App-OSX/Build/Products/Debug/TestProject-App-OSX.app/Contents/Info.plist b/xctool/xctool-tests/TestData/TestProject-App-OSX/Build/Products/Debug/TestProject-App-OSX.app/Contents/Info.plist
index 620d83997..87f083c68 100644
--- a/xctool/xctool-tests/TestData/TestProject-App-OSX/Build/Products/Debug/TestProject-App-OSX.app/Contents/Info.plist
+++ b/xctool/xctool-tests/TestData/TestProject-App-OSX/Build/Products/Debug/TestProject-App-OSX.app/Contents/Info.plist
@@ -25,7 +25,7 @@
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>5A2053</string>
+	<string>5A3005</string>
 	<key>DTPlatformVersion</key>
 	<string>GM</string>
 	<key>DTSDKBuild</key>
@@ -33,9 +33,9 @@
 	<key>DTSDKName</key>
 	<string>macosx10.9</string>
 	<key>DTXcode</key>
-	<string>0501</string>
+	<string>0502</string>
 	<key>DTXcodeBuild</key>
-	<string>5A2053</string>
+	<string>5A3005</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>10.8</string>
 	<key>NSHumanReadableCopyright</key>
diff --git a/xctool/xctool-tests/TestData/TestProject-App-OSX/Build/Products/Debug/TestProject-App-OSX.app/Contents/MacOS/TestProject-App-OSX b/xctool/xctool-tests/TestData/TestProject-App-OSX/Build/Products/Debug/TestProject-App-OSX.app/Contents/MacOS/TestProject-App-OSX
index 25d1002988ef343857183564e7584d0f3ea66f5f..b16b987c1d0cb85d66aa2a8fc3a4db3b7007f7ff 100755
GIT binary patch
delta 32
icmdl{zN36YhY@qJ=ak9aMzLV}wNWjI-kfdh%K-rEnhin#

delta 32
icmdl{zN36YhY|B0yOzn_MzLV}wNWjI-kfdh%K-rNyA8|$

diff --git a/xctool/xctool-tests/TestData/TestProject-App-OSX/Build/Products/Debug/TestProject-App-OSXTests.octest/Contents/Info.plist b/xctool/xctool-tests/TestData/TestProject-App-OSX/Build/Products/Debug/TestProject-App-OSXTests.octest/Contents/Info.plist
index a17270c30..cbf84f8e2 100644
--- a/xctool/xctool-tests/TestData/TestProject-App-OSX/Build/Products/Debug/TestProject-App-OSXTests.octest/Contents/Info.plist
+++ b/xctool/xctool-tests/TestData/TestProject-App-OSX/Build/Products/Debug/TestProject-App-OSXTests.octest/Contents/Info.plist
@@ -23,7 +23,7 @@
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>5A2053</string>
+	<string>5A3005</string>
 	<key>DTPlatformVersion</key>
 	<string>GM</string>
 	<key>DTSDKBuild</key>
@@ -31,8 +31,8 @@
 	<key>DTSDKName</key>
 	<string>macosx10.9</string>
 	<key>DTXcode</key>
-	<string>0501</string>
+	<string>0502</string>
 	<key>DTXcodeBuild</key>
-	<string>5A2053</string>
+	<string>5A3005</string>
 </dict>
 </plist>
diff --git a/xctool/xctool-tests/TestData/TestProject-App-OSX/Build/Products/Debug/TestProject-App-OSXTests.octest/Contents/MacOS/TestProject-App-OSXTests b/xctool/xctool-tests/TestData/TestProject-App-OSX/Build/Products/Debug/TestProject-App-OSXTests.octest/Contents/MacOS/TestProject-App-OSXTests
index ff371096f677c74e705b6554443e062929542e9f..d264a2ade338fdd7b736bcc0fdf1f35004babafa 100755
GIT binary patch
delta 16
XcmcanccX5Dg9&q~=akLPCZgN`LdFJg

delta 16
XcmcanccX5Dg9-CPyOzz)CZgN`MR^9n