Changeset 168045 in webkit
- Timestamp:
- Apr 30, 2014, 2:48:39 PM (11 years ago)
- Location:
- trunk/Tools
- Files:
-
- 2 added
- 3 deleted
- 10 edited
- 1 copied
- 2 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/ChangeLog
r168044 r168045 1 2014-04-30 Simon Fraser <simon.fraser@apple.com> 2 3 [iOS WK2] Add test URL to crash reports for the UI process, clean up project 4 https://bugs.webkit.org/show_bug.cgi?id=131954 5 6 Reviewed by Darin Adler. 7 8 WebKitTestRunner was adding application-specific information to crash reports 9 to log the test path, but only in the web process. Fix it to also do this 10 for the UI process, for both iOS and OS X. 11 12 Moved InjectedBundlePageMac.mm to InjectedBundlePageCocoa.mm and compile it for 13 both iOS and OS X. 14 15 Factored crash reprorter-related code into CrashReporterInfo, and call it from 16 a new TestController::platformWillRunTest() function on Mac and iOS. 17 18 Also remove Xcode-added unit test junk from the project. 19 20 * WebKitTestRunner/InjectedBundle/cocoa/InjectedBundlePageCocoa.mm: Copied from Tools/WebKitTestRunner/InjectedBundle/ios/InjectedBundlePageIOS.mm. 21 (WTR::InjectedBundlePage::platformDidStartProvisionalLoadForFrame): 22 * WebKitTestRunner/TestController.cpp: 23 (WTR::TestController::runTest): 24 * WebKitTestRunner/TestController.h: 25 * WebKitTestRunner/TestInvocation.cpp: 26 (WTR::TestInvocation::url): 27 * WebKitTestRunner/TestInvocation.h: 28 * WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj: 29 * WebKitTestRunner/WebKitTestRunnerAppTests/WebKitTestRunnerAppTests-Info.plist: Removed. 30 * WebKitTestRunner/WebKitTestRunnerAppTests/WebKitTestRunnerAppTests.m: Removed. 31 * WebKitTestRunner/WebKitTestRunnerAppTests/en.lproj/InfoPlist.strings: Removed. 32 * WebKitTestRunner/cocoa/CrashReporterInfo.h: Renamed from Tools/WebKitTestRunner/InjectedBundle/ios/InjectedBundlePageIOS.mm. 33 * WebKitTestRunner/cocoa/CrashReporterInfo.mm: Renamed from Tools/WebKitTestRunner/InjectedBundle/mac/InjectedBundlePageMac.mm. 34 (WTR::testPathFromURL): 35 (WTR::setCrashReportApplicationSpecificInformationToURL): 36 * WebKitTestRunner/efl/TestControllerEfl.cpp: 37 (WTR::TestController::platformWillRunTest): 38 * WebKitTestRunner/gtk/TestControllerGtk.cpp: 39 (WTR::TestController::platformWillRunTest): 40 * WebKitTestRunner/ios/TestControllerIOS.mm: 41 (WTR::TestController::platformWillRunTest): 42 (WTR::TestController::setHidden): 43 * WebKitTestRunner/mac/TestControllerMac.mm: 44 (WTR::TestController::platformWillRunTest): 45 1 46 2014-04-30 Simon Fraser <simon.fraser@apple.com> 2 47 -
trunk/Tools/WebKitTestRunner/InjectedBundle/cocoa/InjectedBundlePageCocoa.mm
r168044 r168045 1 1 /* 2 * Copyright (C) 201 4Apple Inc. All rights reserved.2 * Copyright (C) 2012 Apple Inc. All rights reserved. 3 3 * 4 4 * Redistribution and use in source and binary forms, with or without … … 27 27 #import "InjectedBundlePage.h" 28 28 29 #import " StringFunctions.h"29 #import "CrashReporterInfo.h" 30 30 #import <WebKit2/WKBundleFrame.h> 31 31 #import <WebKit2/WKURLCF.h> 32 #import <WebKitSystemInterface.h>33 #import <wtf/RetainPtr.h>34 #import <wtf/text/StringBuilder.h>35 #import <wtf/text/WTFString.h>36 32 37 33 namespace WTR { … … 39 35 using namespace WTF; 40 36 41 void InjectedBundlePage::platformDidStartProvisionalLoadForFrame(WKBundleFrameRef )37 void InjectedBundlePage::platformDidStartProvisionalLoadForFrame(WKBundleFrameRef frame) 42 38 { 39 if (!WKBundleFrameIsMainFrame(frame)) 40 return; 41 42 WKRetainPtr<WKURLRef> mainFrameURL = adoptWK(WKBundleFrameCopyProvisionalURL(frame)); 43 setCrashReportApplicationSpecificInformationToURL(mainFrameURL.get()); 43 44 } 44 45 -
trunk/Tools/WebKitTestRunner/TestController.cpp
r167007 r168045 755 755 m_currentInvocation->setCustomTimeout(command.timeout); 756 756 757 platformWillRunTest(*m_currentInvocation); 758 757 759 m_currentInvocation->invoke(); 758 760 m_currentInvocation.clear(); -
trunk/Tools/WebKitTestRunner/TestController.h
r167007 r168045 118 118 void platformDestroy(); 119 119 void platformInitializeContext(); 120 void platformWillRunTest(const TestInvocation&); 120 121 void platformRunUntil(bool& done, double timeout); 121 122 void platformDidCommitLoadForFrame(WKPageRef, WKFrameRef); -
trunk/Tools/WebKitTestRunner/TestInvocation.cpp
r166396 r168045 107 107 } 108 108 109 WKURLRef TestInvocation::url() const 110 { 111 return m_url.get(); 112 } 113 109 114 void TestInvocation::setIsPixelTest(const std::string& expectedPixelHash) 110 115 { -
trunk/Tools/WebKitTestRunner/TestInvocation.h
r155140 r168045 40 40 explicit TestInvocation(const std::string& pathOrURL); 41 41 ~TestInvocation(); 42 43 WKURLRef url() const; 42 44 43 45 void setIsPixelTest(const std::string& expectedPixelHash); -
trunk/Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj
r164506 r168045 24 24 0F5169CB1445222D00E0A9D7 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0F5169CA1445222D00E0A9D7 /* WebKit.framework */; }; 25 25 0F5169CC1445222D00E0A9D7 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0F5169CA1445222D00E0A9D7 /* WebKit.framework */; }; 26 0FAF67EF160D6C100077CB2B /* InjectedBundlePageMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0FAF67EE160D6C100077CB2B /* InjectedBundlePageMac.mm */; }; 26 0FEB90A01905A834000FDBF3 /* InjectedBundlePageCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0FEB909E1905A776000FDBF3 /* InjectedBundlePageCocoa.mm */; }; 27 0FEB90A51905C016000FDBF3 /* CrashReporterInfo.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0FEB90A31905BC6A000FDBF3 /* CrashReporterInfo.mm */; }; 28 0FEB90A81905C537000FDBF3 /* CrashReporterInfo.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0FEB90A31905BC6A000FDBF3 /* CrashReporterInfo.mm */; }; 29 0FEB90A91905C548000FDBF3 /* CrashReporterInfo.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0FEB90A31905BC6A000FDBF3 /* CrashReporterInfo.mm */; }; 27 30 26D758E7160BECDD00268472 /* GeolocationProviderMock.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26D758E5160BECDC00268472 /* GeolocationProviderMock.cpp */; }; 28 31 29210EAE144CACB700835BB5 /* AccessibilityUIElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29210EA9144CACB200835BB5 /* AccessibilityUIElement.cpp */; }; … … 44 47 2E63ED8E1891AD7E002A7AFC /* EventSenderProxyIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2E63ED7A1891ACE9002A7AFC /* EventSenderProxyIOS.mm */; }; 45 48 2E63ED8F1891AD7E002A7AFC /* InjectedBundleIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2E63ED7B1891ACE9002A7AFC /* InjectedBundleIOS.mm */; }; 46 2E63ED901891AD7E002A7AFC /* InjectedBundlePageIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2E63ED7C1891ACE9002A7AFC /* InjectedBundlePageIOS.mm */; };47 49 2E63ED911891ADAD002A7AFC /* PlatformWebViewIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2EE52D131890A9FB0010ED21 /* PlatformWebViewIOS.mm */; }; 48 50 2E63ED921891ADAD002A7AFC /* TestControllerIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2EE52D141890A9FB0010ED21 /* TestControllerIOS.mm */; }; … … 66 68 2EE52CE71890A9A80010ED21 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2EE52CE61890A9A80010ED21 /* UIKit.framework */; }; 67 69 2EE52CED1890A9A80010ED21 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 2EE52CEB1890A9A80010ED21 /* InfoPlist.strings */; }; 68 2EE52CFC1890A9A90010ED21 /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2EE52CFB1890A9A90010ED21 /* XCTest.framework */; };69 2EE52CFD1890A9A90010ED21 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2EE52CE21890A9A80010ED21 /* Foundation.framework */; };70 2EE52CFE1890A9A90010ED21 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2EE52CE61890A9A80010ED21 /* UIKit.framework */; };71 2EE52D061890A9A90010ED21 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 2EE52D041890A9A90010ED21 /* InfoPlist.strings */; };72 2EE52D081890A9A90010ED21 /* WebKitTestRunnerAppTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 2EE52D071890A9A90010ED21 /* WebKitTestRunnerAppTests.m */; };73 2EE52D111890A9BB0010ED21 /* WebKitTestRunnerInjectedBundle.bundle in Resources */ = {isa = PBXBuildFile; fileRef = BC25186211D15D54002EBC01 /* WebKitTestRunnerInjectedBundle.bundle */; };74 70 3164C8F015D1ADA100EF1FE0 /* WebNotificationProvider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3164C8EF15D1ADA100EF1FE0 /* WebNotificationProvider.cpp */; }; 75 71 4429FC5F1627089600F66D8B /* WorkQueueManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4429FC5E1627089600F66D8B /* WorkQueueManager.cpp */; }; … … 132 128 remoteInfo = WebKitTestRunnerInjectedBundle; 133 129 }; 134 2EE52CFF1890A9A90010ED21 /* PBXContainerItemProxy */ = {135 isa = PBXContainerItemProxy;136 containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;137 proxyType = 1;138 remoteGlobalIDString = 2EE52CDF1890A9A80010ED21;139 remoteInfo = WebKitTestRunnerApp;140 };141 130 BC25194111D15D94002EBC01 /* PBXContainerItemProxy */ = { 142 131 isa = PBXContainerItemProxy; … … 158 147 0F2109C7189C650D00F879A3 /* BaseTarget.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = BaseTarget.xcconfig; sourceTree = "<group>"; }; 159 148 0F5169CA1445222D00E0A9D7 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = WebKit.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 160 0FAF67EE160D6C100077CB2B /* InjectedBundlePageMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = InjectedBundlePageMac.mm; sourceTree = "<group>"; }; 149 0FEB909E1905A776000FDBF3 /* InjectedBundlePageCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = InjectedBundlePageCocoa.mm; path = cocoa/InjectedBundlePageCocoa.mm; sourceTree = "<group>"; }; 150 0FEB90A21905BC6A000FDBF3 /* CrashReporterInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CrashReporterInfo.h; path = cocoa/CrashReporterInfo.h; sourceTree = "<group>"; }; 151 0FEB90A31905BC6A000FDBF3 /* CrashReporterInfo.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = CrashReporterInfo.mm; path = cocoa/CrashReporterInfo.mm; sourceTree = "<group>"; }; 161 152 26D758E5160BECDC00268472 /* GeolocationProviderMock.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GeolocationProviderMock.cpp; sourceTree = "<group>"; }; 162 153 26D758E6160BECDD00268472 /* GeolocationProviderMock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GeolocationProviderMock.h; sourceTree = "<group>"; }; … … 190 181 2E63ED7A1891ACE9002A7AFC /* EventSenderProxyIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = EventSenderProxyIOS.mm; sourceTree = "<group>"; }; 191 182 2E63ED7B1891ACE9002A7AFC /* InjectedBundleIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = InjectedBundleIOS.mm; sourceTree = "<group>"; }; 192 2E63ED7C1891ACE9002A7AFC /* InjectedBundlePageIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = InjectedBundlePageIOS.mm; sourceTree = "<group>"; };193 183 2EE52CE01890A9A80010ED21 /* WebKitTestRunnerApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = WebKitTestRunnerApp.app; sourceTree = BUILT_PRODUCTS_DIR; }; 194 184 2EE52CE21890A9A80010ED21 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; … … 199 189 2EE52CF11890A9A80010ED21 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; }; 200 190 2EE52CF21890A9A80010ED21 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; }; 201 2EE52CFA1890A9A80010ED21 /* WebKitTestRunnerAppTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = WebKitTestRunnerAppTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };202 2EE52CFB1890A9A90010ED21 /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; };203 2EE52D031890A9A90010ED21 /* WebKitTestRunnerAppTests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "WebKitTestRunnerAppTests-Info.plist"; sourceTree = "<group>"; };204 2EE52D051890A9A90010ED21 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };205 2EE52D071890A9A90010ED21 /* WebKitTestRunnerAppTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = WebKitTestRunnerAppTests.m; sourceTree = "<group>"; };206 191 2EE52D131890A9FB0010ED21 /* PlatformWebViewIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PlatformWebViewIOS.mm; sourceTree = "<group>"; }; 207 192 2EE52D141890A9FB0010ED21 /* TestControllerIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = TestControllerIOS.mm; sourceTree = "<group>"; }; … … 319 304 runOnlyForDeploymentPostprocessing = 0; 320 305 }; 321 2EE52CF71890A9A80010ED21 /* Frameworks */ = {322 isa = PBXFrameworksBuildPhase;323 buildActionMask = 2147483647;324 files = (325 2EE52CFC1890A9A90010ED21 /* XCTest.framework in Frameworks */,326 2EE52CFE1890A9A90010ED21 /* UIKit.framework in Frameworks */,327 2EE52CFD1890A9A90010ED21 /* Foundation.framework in Frameworks */,328 );329 runOnlyForDeploymentPostprocessing = 0;330 };331 306 8DD76F9B0486AA7600D96B5E /* Frameworks */ = { 332 307 isa = PBXFrameworksBuildPhase; … … 365 340 BC25194411D15DBE002EBC01 /* Resources */, 366 341 2EE52CE81890A9A80010ED21 /* WebKitTestRunnerApp */, 367 2EE52D011890A9A90010ED21 /* WebKitTestRunnerAppTests */,368 342 2EE52CE11890A9A80010ED21 /* Frameworks */, 369 343 1AB674ADFE9D54B511CA2CBB /* Products */, … … 375 349 isa = PBXGroup; 376 350 children = ( 351 0FEB90A11905BC4A000FDBF3 /* cocoa */, 377 352 2EE52D121890A9FB0010ED21 /* ios */, 378 353 841CC00D181185BF0042E9B6 /* Options.cpp */, … … 415 390 sourceTree = "<group>"; 416 391 }; 392 0FEB909D1905A75D000FDBF3 /* cocoa */ = { 393 isa = PBXGroup; 394 children = ( 395 0FEB909E1905A776000FDBF3 /* InjectedBundlePageCocoa.mm */, 396 ); 397 name = cocoa; 398 sourceTree = "<group>"; 399 }; 400 0FEB90A11905BC4A000FDBF3 /* cocoa */ = { 401 isa = PBXGroup; 402 children = ( 403 0FEB90A21905BC6A000FDBF3 /* CrashReporterInfo.h */, 404 0FEB90A31905BC6A000FDBF3 /* CrashReporterInfo.mm */, 405 ); 406 name = cocoa; 407 sourceTree = "<group>"; 408 }; 417 409 1AB674ADFE9D54B511CA2CBB /* Products */ = { 418 410 isa = PBXGroup; … … 421 413 BC25186211D15D54002EBC01 /* WebKitTestRunnerInjectedBundle.bundle */, 422 414 2EE52CE01890A9A80010ED21 /* WebKitTestRunnerApp.app */, 423 2EE52CFA1890A9A80010ED21 /* WebKitTestRunnerAppTests.xctest */,424 415 ); 425 416 name = Products; … … 454 445 2E63ED7A1891ACE9002A7AFC /* EventSenderProxyIOS.mm */, 455 446 2E63ED7B1891ACE9002A7AFC /* InjectedBundleIOS.mm */, 456 2E63ED7C1891ACE9002A7AFC /* InjectedBundlePageIOS.mm */,457 447 ); 458 448 path = ios; … … 465 455 2EE52CE41890A9A80010ED21 /* CoreGraphics.framework */, 466 456 2EE52CE61890A9A80010ED21 /* UIKit.framework */, 467 2EE52CFB1890A9A90010ED21 /* XCTest.framework */,468 457 ); 469 458 name = Frameworks; … … 477 466 ); 478 467 path = WebKitTestRunnerApp; 479 sourceTree = "<group>";480 };481 2EE52D011890A9A90010ED21 /* WebKitTestRunnerAppTests */ = {482 isa = PBXGroup;483 children = (484 2EE52D071890A9A90010ED21 /* WebKitTestRunnerAppTests.m */,485 2EE52D021890A9A90010ED21 /* Supporting Files */,486 );487 path = WebKitTestRunnerAppTests;488 sourceTree = "<group>";489 };490 2EE52D021890A9A90010ED21 /* Supporting Files */ = {491 isa = PBXGroup;492 children = (493 2EE52D031890A9A90010ED21 /* WebKitTestRunnerAppTests-Info.plist */,494 2EE52D041890A9A90010ED21 /* InfoPlist.strings */,495 );496 name = "Supporting Files";497 468 sourceTree = "<group>"; 498 469 }; … … 528 499 65EB859F11EC67CC0034D300 /* ActivateFonts.mm */, 529 500 BC8DAD771316D7B900EC96FC /* InjectedBundleMac.mm */, 530 0FAF67EE160D6C100077CB2B /* InjectedBundlePageMac.mm */,531 501 ); 532 502 path = mac; … … 554 524 children = ( 555 525 2E63ED741891ACE9002A7AFC /* ios */, 526 0FEB909D1905A75D000FDBF3 /* cocoa */, 556 527 5C45C31017398E370079714E /* cf */, 557 528 BC952C0A11F3B939003398B4 /* Bindings */, … … 699 670 productType = "com.apple.product-type.application"; 700 671 }; 701 2EE52CF91890A9A80010ED21 /* WebKitTestRunnerAppTests */ = {702 isa = PBXNativeTarget;703 buildConfigurationList = 2EE52D101890A9A90010ED21 /* Build configuration list for PBXNativeTarget "WebKitTestRunnerAppTests" */;704 buildPhases = (705 2EE52CF61890A9A80010ED21 /* Sources */,706 2EE52CF71890A9A80010ED21 /* Frameworks */,707 2EE52CF81890A9A80010ED21 /* Resources */,708 );709 buildRules = (710 );711 dependencies = (712 2EE52D001890A9A90010ED21 /* PBXTargetDependency */,713 );714 name = WebKitTestRunnerAppTests;715 productName = WebKitTestRunnerAppTests;716 productReference = 2EE52CFA1890A9A80010ED21 /* WebKitTestRunnerAppTests.xctest */;717 productType = "com.apple.product-type.bundle.unit-test";718 };719 672 8DD76F960486AA7600D96B5E /* WebKitTestRunner */ = { 720 673 isa = PBXNativeTarget; … … 759 712 isa = PBXProject; 760 713 attributes = { 761 TargetAttributes = {762 2EE52CF91890A9A80010ED21 = {763 TestTargetID = 2EE52CDF1890A9A80010ED21;764 };765 };766 714 }; 767 715 buildConfigurationList = 1DEB927808733DD40010E9CD /* Build configuration list for PBXProject "WebKitTestRunner" */; … … 784 732 BC952D7711F3BF5D003398B4 /* Derived Sources */, 785 733 2EE52CDF1890A9A80010ED21 /* WebKitTestRunnerApp */, 786 2EE52CF91890A9A80010ED21 /* WebKitTestRunnerAppTests */,787 734 ); 788 735 }; … … 796 743 2E34C90018B68808000067BB /* WebKitTestRunnerInjectedBundle.bundle in Resources */, 797 744 2EE52CED1890A9A80010ED21 /* InfoPlist.strings in Resources */, 798 );799 runOnlyForDeploymentPostprocessing = 0;800 };801 2EE52CF81890A9A80010ED21 /* Resources */ = {802 isa = PBXResourcesBuildPhase;803 buildActionMask = 2147483647;804 files = (805 2EE52D111890A9BB0010ED21 /* WebKitTestRunnerInjectedBundle.bundle in Resources */,806 2EE52D061890A9A90010ED21 /* InfoPlist.strings in Resources */,807 745 ); 808 746 runOnlyForDeploymentPostprocessing = 0; … … 857 795 2E63ED981891ADC7002A7AFC /* TestController.cpp in Sources */, 858 796 2E63ED921891ADAD002A7AFC /* TestControllerIOS.mm in Sources */, 797 0FEB90A81905C537000FDBF3 /* CrashReporterInfo.mm in Sources */, 859 798 2E63ED991891ADC7002A7AFC /* TestInvocation.cpp in Sources */, 860 799 2E63EDA51891BD8E002A7AFC /* TestInvocationCG.cpp in Sources */, … … 864 803 2E63ED9C1891ADC7002A7AFC /* AppDelegate.m in Sources */, 865 804 2E63ED911891ADAD002A7AFC /* PlatformWebViewIOS.mm in Sources */, 866 );867 runOnlyForDeploymentPostprocessing = 0;868 };869 2EE52CF61890A9A80010ED21 /* Sources */ = {870 isa = PBXSourcesBuildPhase;871 buildActionMask = 2147483647;872 files = (873 2EE52D081890A9A90010ED21 /* WebKitTestRunnerAppTests.m in Sources */,874 805 ); 875 806 runOnlyForDeploymentPostprocessing = 0; … … 889 820 BC7934E811906846005EA8E2 /* PlatformWebViewMac.mm in Sources */, 890 821 BC793431118F7F19005EA8E2 /* TestController.cpp in Sources */, 822 0FEB90A91905C548000FDBF3 /* CrashReporterInfo.mm in Sources */, 891 823 BC8C795C11D2785D004535A1 /* TestControllerMac.mm in Sources */, 892 824 BCD7D2F811921278006DB7EE /* TestInvocation.cpp in Sources */, … … 911 843 2E63ED8E1891AD7E002A7AFC /* EventSenderProxyIOS.mm in Sources */, 912 844 2E63ED8F1891AD7E002A7AFC /* InjectedBundleIOS.mm in Sources */, 913 2E63ED901891AD7E002A7AFC /* InjectedBundlePageIOS.mm in Sources */,914 845 29210EDA144CC3EA00835BB6 /* AccessibilityCommonMac.mm in Sources */, 915 846 29210EB0144CACBD00835BB5 /* AccessibilityController.cpp in Sources */, 916 847 8034C6621487636400AC32E9 /* AccessibilityControllerMac.mm in Sources */, 917 848 8097338A14874A5A008156D9 /* AccessibilityNotificationHandler.mm in Sources */, 849 0FEB90A51905C016000FDBF3 /* CrashReporterInfo.mm in Sources */, 918 850 29210EB4144CACD500835BB5 /* AccessibilityTextMarker.cpp in Sources */, 919 851 29210EB5144CACD500835BB5 /* AccessibilityTextMarkerMac.mm in Sources */, … … 929 861 BC251A3E11D16831002EBC01 /* InjectedBundleMain.cpp in Sources */, 930 862 BCC997A511D3C8F60017BCA2 /* InjectedBundlePage.cpp in Sources */, 931 0FAF67EF160D6C100077CB2B /* InjectedBundlePageMac.mm in Sources */,932 863 29210EDB144CD47900835BB5 /* JSAccessibilityController.cpp in Sources */, 933 864 29A8FCCB145EF02E009045A6 /* JSAccessibilityTextMarker.cpp in Sources */, 865 0FEB90A01905A834000FDBF3 /* InjectedBundlePageCocoa.mm in Sources */, 934 866 29A8FCDD145F0337009045A6 /* JSAccessibilityTextMarkerRange.cpp in Sources */, 935 867 29210EE1144CDB2600835BB5 /* JSAccessibilityUIElement.cpp in Sources */, … … 954 886 targetProxy = 2E63ED881891AD47002A7AFC /* PBXContainerItemProxy */; 955 887 }; 956 2EE52D001890A9A90010ED21 /* PBXTargetDependency */ = {957 isa = PBXTargetDependency;958 target = 2EE52CDF1890A9A80010ED21 /* WebKitTestRunnerApp */;959 targetProxy = 2EE52CFF1890A9A90010ED21 /* PBXContainerItemProxy */;960 };961 888 BC25194211D15D94002EBC01 /* PBXTargetDependency */ = { 962 889 isa = PBXTargetDependency; … … 979 906 name = InfoPlist.strings; 980 907 path = ../WebKitTestRunnerApp; 981 sourceTree = "<group>";982 };983 2EE52D041890A9A90010ED21 /* InfoPlist.strings */ = {984 isa = PBXVariantGroup;985 children = (986 2EE52D051890A9A90010ED21 /* en */,987 );988 name = InfoPlist.strings;989 908 sourceTree = "<group>"; 990 909 }; … … 1066 985 name = Production; 1067 986 }; 1068 2EE52D0C1890A9A90010ED21 /* Debug */ = {1069 isa = XCBuildConfiguration;1070 buildSettings = {1071 ALWAYS_SEARCH_USER_PATHS = NO;1072 ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";1073 BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/WebKitTestRunnerApp.app/WebKitTestRunnerApp";1074 CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";1075 CLANG_CXX_LIBRARY = "libc++";1076 CLANG_ENABLE_MODULES = YES;1077 CLANG_ENABLE_OBJC_ARC = YES;1078 CLANG_WARN_BOOL_CONVERSION = YES;1079 CLANG_WARN_CONSTANT_CONVERSION = YES;1080 CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;1081 CLANG_WARN_EMPTY_BODY = YES;1082 CLANG_WARN_ENUM_CONVERSION = YES;1083 CLANG_WARN_INT_CONVERSION = YES;1084 CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;1085 CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;1086 COPY_PHASE_STRIP = NO;1087 FRAMEWORK_SEARCH_PATHS = (1088 "$(SDKROOT)/Developer/Library/Frameworks",1089 "$(inherited)",1090 "$(DEVELOPER_FRAMEWORKS_DIR)",1091 );1092 GCC_C_LANGUAGE_STANDARD = gnu99;1093 GCC_DYNAMIC_NO_PIC = NO;1094 GCC_PRECOMPILE_PREFIX_HEADER = YES;1095 GCC_PREFIX_HEADER = "WebKitTestRunnerApp/WebKitTestRunnerApp-Prefix.pch";1096 GCC_PREPROCESSOR_DEFINITIONS = (1097 "DEBUG=1",1098 "$(inherited)",1099 );1100 GCC_SYMBOLS_PRIVATE_EXTERN = NO;1101 GCC_WARN_64_TO_32_BIT_CONVERSION = YES;1102 GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;1103 GCC_WARN_UNDECLARED_SELECTOR = YES;1104 GCC_WARN_UNINITIALIZED_AUTOS = YES;1105 GCC_WARN_UNUSED_FUNCTION = YES;1106 GCC_WARN_UNUSED_VARIABLE = YES;1107 INFOPLIST_FILE = "WebKitTestRunnerAppTests/WebKitTestRunnerAppTests-Info.plist";1108 IPHONEOS_DEPLOYMENT_TARGET = 8.0;1109 ONLY_ACTIVE_ARCH = YES;1110 PRODUCT_NAME = "$(TARGET_NAME)";1111 SDKROOT = iphoneos;1112 TEST_HOST = "$(BUNDLE_LOADER)";1113 WRAPPER_EXTENSION = xctest;1114 };1115 name = Debug;1116 };1117 2EE52D0D1890A9A90010ED21 /* Release */ = {1118 isa = XCBuildConfiguration;1119 buildSettings = {1120 ALWAYS_SEARCH_USER_PATHS = NO;1121 ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";1122 BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/WebKitTestRunnerApp.app/WebKitTestRunnerApp";1123 CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";1124 CLANG_CXX_LIBRARY = "libc++";1125 CLANG_ENABLE_MODULES = YES;1126 CLANG_ENABLE_OBJC_ARC = YES;1127 CLANG_WARN_BOOL_CONVERSION = YES;1128 CLANG_WARN_CONSTANT_CONVERSION = YES;1129 CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;1130 CLANG_WARN_EMPTY_BODY = YES;1131 CLANG_WARN_ENUM_CONVERSION = YES;1132 CLANG_WARN_INT_CONVERSION = YES;1133 CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;1134 CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;1135 COPY_PHASE_STRIP = YES;1136 ENABLE_NS_ASSERTIONS = NO;1137 FRAMEWORK_SEARCH_PATHS = (1138 "$(SDKROOT)/Developer/Library/Frameworks",1139 "$(inherited)",1140 "$(DEVELOPER_FRAMEWORKS_DIR)",1141 );1142 GCC_C_LANGUAGE_STANDARD = gnu99;1143 GCC_PRECOMPILE_PREFIX_HEADER = YES;1144 GCC_PREFIX_HEADER = "WebKitTestRunnerApp/WebKitTestRunnerApp-Prefix.pch";1145 GCC_WARN_64_TO_32_BIT_CONVERSION = YES;1146 GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;1147 GCC_WARN_UNDECLARED_SELECTOR = YES;1148 GCC_WARN_UNINITIALIZED_AUTOS = YES;1149 GCC_WARN_UNUSED_FUNCTION = YES;1150 GCC_WARN_UNUSED_VARIABLE = YES;1151 INFOPLIST_FILE = "WebKitTestRunnerAppTests/WebKitTestRunnerAppTests-Info.plist";1152 IPHONEOS_DEPLOYMENT_TARGET = 8.0;1153 PRODUCT_NAME = "$(TARGET_NAME)";1154 SDKROOT = iphoneos;1155 TEST_HOST = "$(BUNDLE_LOADER)";1156 VALIDATE_PRODUCT = YES;1157 WRAPPER_EXTENSION = xctest;1158 };1159 name = Release;1160 };1161 2EE52D0E1890A9A90010ED21 /* Production */ = {1162 isa = XCBuildConfiguration;1163 buildSettings = {1164 ALWAYS_SEARCH_USER_PATHS = NO;1165 ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";1166 BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/WebKitTestRunnerApp.app/WebKitTestRunnerApp";1167 CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";1168 CLANG_CXX_LIBRARY = "libc++";1169 CLANG_ENABLE_MODULES = YES;1170 CLANG_ENABLE_OBJC_ARC = YES;1171 CLANG_WARN_BOOL_CONVERSION = YES;1172 CLANG_WARN_CONSTANT_CONVERSION = YES;1173 CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;1174 CLANG_WARN_EMPTY_BODY = YES;1175 CLANG_WARN_ENUM_CONVERSION = YES;1176 CLANG_WARN_INT_CONVERSION = YES;1177 CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;1178 CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;1179 COPY_PHASE_STRIP = YES;1180 ENABLE_NS_ASSERTIONS = NO;1181 FRAMEWORK_SEARCH_PATHS = (1182 "$(SDKROOT)/Developer/Library/Frameworks",1183 "$(inherited)",1184 "$(DEVELOPER_FRAMEWORKS_DIR)",1185 );1186 GCC_C_LANGUAGE_STANDARD = gnu99;1187 GCC_PRECOMPILE_PREFIX_HEADER = YES;1188 GCC_PREFIX_HEADER = "WebKitTestRunnerApp/WebKitTestRunnerApp-Prefix.pch";1189 GCC_WARN_64_TO_32_BIT_CONVERSION = YES;1190 GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;1191 GCC_WARN_UNDECLARED_SELECTOR = YES;1192 GCC_WARN_UNINITIALIZED_AUTOS = YES;1193 GCC_WARN_UNUSED_FUNCTION = YES;1194 GCC_WARN_UNUSED_VARIABLE = YES;1195 INFOPLIST_FILE = "WebKitTestRunnerAppTests/WebKitTestRunnerAppTests-Info.plist";1196 IPHONEOS_DEPLOYMENT_TARGET = 8.0;1197 PRODUCT_NAME = "$(TARGET_NAME)";1198 SDKROOT = iphoneos;1199 TEST_HOST = "$(BUNDLE_LOADER)";1200 VALIDATE_PRODUCT = YES;1201 WRAPPER_EXTENSION = xctest;1202 };1203 name = Production;1204 };1205 987 BC25186411D15D55002EBC01 /* Debug */ = { 1206 988 isa = XCBuildConfiguration; … … 1292 1074 defaultConfigurationName = Production; 1293 1075 }; 1294 2EE52D101890A9A90010ED21 /* Build configuration list for PBXNativeTarget "WebKitTestRunnerAppTests" */ = {1295 isa = XCConfigurationList;1296 buildConfigurations = (1297 2EE52D0C1890A9A90010ED21 /* Debug */,1298 2EE52D0D1890A9A90010ED21 /* Release */,1299 2EE52D0E1890A9A90010ED21 /* Production */,1300 );1301 defaultConfigurationIsVisible = 0;1302 defaultConfigurationName = Production;1303 };1304 1076 BC25186611D15D55002EBC01 /* Build configuration list for PBXNativeTarget "WebKitTestRunnerInjectedBundle" */ = { 1305 1077 isa = XCConfigurationList; -
trunk/Tools/WebKitTestRunner/cocoa/CrashReporterInfo.h
r168044 r168045 24 24 */ 25 25 26 #import "config.h" 27 #import "InjectedBundlePage.h" 28 29 #import "StringFunctions.h" 30 #import <WebKit2/WKBundleFrame.h> 31 #import <WebKit2/WKURLCF.h> 32 #import <WebKitSystemInterface.h> 33 #import <wtf/RetainPtr.h> 34 #import <wtf/text/StringBuilder.h> 35 #import <wtf/text/WTFString.h> 26 #ifndef CrashReporterInfo_h 27 #define CrashReporterInfo_h 36 28 37 29 namespace WTR { 38 30 39 using namespace WTF;31 void setCrashReportApplicationSpecificInformationToURL(WKURLRef); 40 32 41 void InjectedBundlePage::platformDidStartProvisionalLoadForFrame(WKBundleFrameRef)42 {43 33 } 44 34 45 } // namespace WTR 35 #endif // CrashReporterInfo_h -
trunk/Tools/WebKitTestRunner/cocoa/CrashReporterInfo.mm
r168044 r168045 1 1 /* 2 * Copyright (C) 201 2Apple Inc. All rights reserved.2 * Copyright (C) 2014 Apple Inc. All rights reserved. 3 3 * 4 4 * Redistribution and use in source and binary forms, with or without … … 25 25 26 26 #import "config.h" 27 #import " InjectedBundlePage.h"27 #import "CrashReporterInfo.h" 28 28 29 29 #import "StringFunctions.h" 30 #import <WebKit2/WKBundleFrame.h>31 30 #import <WebKit2/WKURLCF.h> 32 31 #import <WebKitSystemInterface.h> 33 32 #import <wtf/RetainPtr.h> 34 #import <wtf/text/StringBuilder.h>35 #import <wtf/text/WTFString.h>36 33 37 34 namespace WTR { 38 39 using namespace WTF;40 35 41 36 static String testPathFromURL(WKURLRef url) … … 71 66 } 72 67 73 void InjectedBundlePage::platformDidStartProvisionalLoadForFrame(WKBundleFrameRef frame)68 void setCrashReportApplicationSpecificInformationToURL(WKURLRef url) 74 69 { 75 if (!WKBundleFrameIsMainFrame(frame)) 76 return; 77 78 WKRetainPtr<WKURLRef> mainFrameURL = adoptWK(WKBundleFrameCopyProvisionalURL(frame)); 79 80 String testPath = testPathFromURL(mainFrameURL.get()); 70 String testPath = testPathFromURL(url); 81 71 if (!testPath.isNull()) { 82 StringBuilder builder; 83 builder.appendLiteral("CRASHING TEST: "); 84 builder.append(testPath); 85 WKSetCrashReportApplicationSpecificInformation(builder.toString().createCFString().get()); 72 String message("CRASHING TEST:"); 73 message = message + testPath; 74 WKSetCrashReportApplicationSpecificInformation(message.createCFString().get()); 86 75 } 87 76 } -
trunk/Tools/WebKitTestRunner/efl/TestControllerEfl.cpp
r162123 r168045 61 61 62 62 void TestController::platformDestroy() 63 { 64 } 65 66 void TestController::platformWillRunTest(const TestInvocation&) 63 67 { 64 68 } -
trunk/Tools/WebKitTestRunner/gtk/TestControllerGtk.cpp
r162599 r168045 66 66 } 67 67 68 void TestController::platformWillRunTest(const TestInvocation&) 69 { 70 } 71 68 72 void TestController::platformRunUntil(bool&, double timeout) 69 73 { -
trunk/Tools/WebKitTestRunner/ios/TestControllerIOS.mm
r162729 r168045 27 27 #import "TestController.h" 28 28 29 #import "CrashReporterInfo.h" 29 30 #import "PlatformWebView.h" 31 #import "TestInvocation.h" 30 32 #import <WebKit2/WKStringCF.h> 31 33 #include <wtf/MainThread.h> … … 56 58 } 57 59 60 void TestController::platformWillRunTest(const TestInvocation& testInvocation) 61 { 62 setCrashReportApplicationSpecificInformationToURL(testInvocation.url()); 63 } 64 58 65 void TestController::platformRunUntil(bool& done, double timeout) 59 66 { … … 82 89 } 83 90 84 void TestController::setHidden(bool) { 91 void TestController::setHidden(bool) 92 { 85 93 // FIXME: implement for iOS 86 94 } -
trunk/Tools/WebKitTestRunner/mac/TestControllerMac.mm
r161105 r168045 27 27 #import "TestController.h" 28 28 29 #import "CrashReporterInfo.h" 29 30 #import "PlatformWebView.h" 30 31 #import "PoseAsClass.h" 32 #import "TestInvocation.h" 31 33 #import "WebKitTestRunnerPasteboard.h" 32 34 #import <WebKit2/WKStringCF.h> … … 65 67 { 66 68 m_testPluginDirectory.adopt(WKStringCreateWithCFString((CFStringRef)[[NSBundle mainBundle] bundlePath])); 69 } 70 71 void TestController::platformWillRunTest(const TestInvocation& testInvocation) 72 { 73 setCrashReportApplicationSpecificInformationToURL(testInvocation.url()); 67 74 } 68 75
Note:
See TracChangeset
for help on using the changeset viewer.