REGRESSION (r192375): DumpRenderTree.app exits immediately with no error
authorddkilzer@apple.com <ddkilzer@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 15 Dec 2015 22:10:20 +0000 (22:10 +0000)
committerddkilzer@apple.com <ddkilzer@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 15 Dec 2015 22:10:20 +0000 (22:10 +0000)
commit39effa1da04f902022f05e322ed69b231d0ca422
tree8bc954eb6fd66d5cd7841348ee50937e6f869c96
parent7274b35d0ef6b8f0c5e7e5938492cff835c925f9
REGRESSION (r192375): DumpRenderTree.app exits immediately with no error
<http://webkit.org/b/152314>

Reviewed by Daniel Bates.

The change to DumpRenderTreeMain.mm in r192375 caused the iOS
code path to exit immediately when calling main().
Unfortunately, DumpRenderTreeMain.mm was used for both
DumpRenderTree command-line binary and DumpRenderTree.app, which
meant that the app would exit immediately with no error code
when run!

The workaround is to introduce a separate source file called
DumpRenderTreeAppMain.mm, similar to what WebKitTestRunner
already does.

* DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj: Add
DumpRenderTreeAppMain.mm to the project.  Make it the only
compiled source for the DumpRenderTree.app target.
* DumpRenderTree/ios/DumpRenderTreeAppMain.mm: Copied from Tools/DumpRenderTree/mac/DumpRenderTreeMain.mm.
(main): Call DumpRenderTreeMain() on iOS.  Assert on OS X in
case someone tries mistakenly to use the app.
* DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig:
Link to JavaScriptCore.framework on iOS for the assert.
* DumpRenderTree/mac/Configurations/DumpRenderTreeApp.xcconfig:
Link to JavaScriptCore.framework on OS X for the assert.  Remove
unneeded EXCLUDED_SOURCE_FILE_NAMES setting.
* DumpRenderTree/mac/DumpRenderTreeMain.mm:
(main): Add assert for iOS so that a crash occurs if someone
tries to run the wrong command.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@194115 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Tools/ChangeLog
Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj
Tools/DumpRenderTree/ios/DumpRenderTreeAppMain.mm [new file with mode: 0644]
Tools/DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig
Tools/DumpRenderTree/mac/Configurations/DumpRenderTreeApp.xcconfig
Tools/DumpRenderTree/mac/DumpRenderTreeMain.mm