Title: [171516] tags/Safari-600.1.2.1/Tools
- Revision
- 171516
- Author
- bshaf...@apple.com
- Date
- 2014-07-24 12:57:20 -0700 (Thu, 24 Jul 2014)
Log Message
Merged r171487. <rdar://problem/17735912>
Modified Paths
Diff
Modified: tags/Safari-600.1.2.1/Tools/ChangeLog (171515 => 171516)
--- tags/Safari-600.1.2.1/Tools/ChangeLog 2014-07-24 19:52:28 UTC (rev 171515)
+++ tags/Safari-600.1.2.1/Tools/ChangeLog 2014-07-24 19:57:20 UTC (rev 171516)
@@ -1,3 +1,16 @@
+2014-07-24 Babak Shafiei <bshaf...@apple.com>
+
+ Merge r171487
+
+ 2014-07-23 Joseph Pecoraro <pecor...@apple.com>
+
+ Unreviewed iOS build fix after r171355.
+
+ * TestWebKitAPI/Configurations/Base.xcconfig:
+ Since all the Tests/WebKit2Cocoa tests are already explicitly skipped on iOS,
+ simplify to skipping all the tests in the directory. PlatformUtilities are not
+ building on iOS, which means we are missing necessary Util functions.
+
2014-07-23 Lucas Forschler <lforsch...@apple.com>
Merge r171355
Modified: tags/Safari-600.1.2.1/Tools/TestWebKitAPI/Configurations/Base.xcconfig (171515 => 171516)
--- tags/Safari-600.1.2.1/Tools/TestWebKitAPI/Configurations/Base.xcconfig 2014-07-24 19:52:28 UTC (rev 171515)
+++ tags/Safari-600.1.2.1/Tools/TestWebKitAPI/Configurations/Base.xcconfig 2014-07-24 19:57:20 UTC (rev 171516)
@@ -64,7 +64,7 @@
EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(PLATFORM_NAME));
EXCLUDED_SOURCE_FILE_NAMES_macosx = *IOS.h *IOS.cpp *IOS.mm;
-EXCLUDED_SOURCE_FILE_NAMES_iphoneos = *Mac.h *Mac.cpp *Mac.mm *InjectedBundle* *PlatformUtilities* Tests/WebKit2/* Tests/WebKit2ObjC/* *_Bundle* _javascript_Test.* */mac/* CustomProtocolsSyncXHRTest.mm Tests/WebKit2Cocoa/Navigation.mm Tests/WebKit2Cocoa/Download.mm;
+EXCLUDED_SOURCE_FILE_NAMES_iphoneos = *Mac.h *Mac.cpp *Mac.mm *InjectedBundle* *PlatformUtilities* Tests/WebKit2/* Tests/WebKit2ObjC/* *_Bundle* _javascript_Test.* */mac/* CustomProtocolsSyncXHRTest.mm Tests/WebKit2Cocoa/*;
EXCLUDED_SOURCE_FILE_NAMES_iphonesimulator = $(EXCLUDED_SOURCE_FILE_NAMES_iphoneos);
TOOLCHAINS = $(TOOLCHAINS_$(PLATFORM_NAME));
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
