Bug 186927 - [WinCairo] ImageDiff should use DLLLauncher
Summary: [WinCairo] ImageDiff should use DLLLauncher
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: New Bugs (show other bugs)
Version: WebKit Nightly Build
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Ross Kirsling
URL:
Keywords: InRadar
Depends on:
Blocks:
 
Reported: 2018-06-22 09:50 PDT by Ross Kirsling
Modified: 2018-06-22 15:14 PDT (History)
6 users (show)

See Also:

Attachments
Patch (2.72 KB, patch)
2018-06-22 09:52 PDT, Ross Kirsling 		no flags Details | Formatted Diff | Diff
Patch (2.68 KB, patch)
2018-06-22 10:34 PDT, Ross Kirsling 		no flags Details | Formatted Diff | Diff
Show Obsolete (1) View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Ross Kirsling 2018-06-22 09:50:07 PDT 
[WinCairo] ImageDiff should use DLLLauncher
Comment 1 Ross Kirsling 2018-06-22 09:52:47 PDT 
Created attachment 343334 [details]
Patch
Comment 2 Per Arne Vollan 2018-06-22 09:57:40 PDT 
Could you also make this change for AppleWin?
Comment 3 Ross Kirsling 2018-06-22 10:19:56 PDT 
(In reply to Per Arne Vollan from comment #2)
> Could you also make this change for AppleWin?

Absolutely. Don and I thought perhaps you guys wouldn't want the extra overhead if you didn't need it. :)
Comment 4 Per Arne Vollan 2018-06-22 10:29:32 PDT 
(In reply to Ross Kirsling from comment #3)
> (In reply to Per Arne Vollan from comment #2)
> > Could you also make this change for AppleWin?
> 
> Absolutely. Don and I thought perhaps you guys wouldn't want the extra
> overhead if you didn't need it. :)

Great. I think also AppleWin needs this. I've had issues where ImageDiff did not start because it couldn't find dlls.
Comment 5 Ross Kirsling 2018-06-22 10:34:19 PDT 
Created attachment 343341 [details]
Patch
Comment 6 Per Arne Vollan 2018-06-22 10:42:53 PDT 
Comment on attachment 343341 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=343341&action=review

Looks good. R=me. Please make sure EWS is green before landing.

> Tools/ImageDiff/PlatformWin.cmake:15
> +set(IMAGE_DIFF_SOURCES ${TOOLS_DIR}/win/DLLLauncher/DLLLauncherMain.cpp)
> +set(IMAGE_DIFF_LIBRARIES shlwapi)

Should IMAGE_DIFF_SOURCES and IMAGE_DIFF_LIBRARIES be set before being referenced, or isn't that necessary?
Comment 7 Ross Kirsling 2018-06-22 10:59:23 PDT 
(In reply to Per Arne Vollan from comment #6)
> > Tools/ImageDiff/PlatformWin.cmake:15
> > +set(IMAGE_DIFF_SOURCES ${TOOLS_DIR}/win/DLLLauncher/DLLLauncherMain.cpp)
> > +set(IMAGE_DIFF_LIBRARIES shlwapi)
> 
> Should IMAGE_DIFF_SOURCES and IMAGE_DIFF_LIBRARIES be set before being
> referenced, or isn't that necessary?

This is actually overwriting them -- the "real" sources/libs are redirected to ImageDiffLib and then ImageDiff becomes just the DLLLauncher wrapper. (This is the same as what DRT and TestWebKitAPI do, and appears to be necessitated by having two main() functions.)
Comment 8 Ross Kirsling 2018-06-22 14:46:05 PDT 
Note: AppleWin EWS has been failing since r233066 and force clean is failing.
Going to land since the log suggests that ImageDiff.exe is being built successfully.
Comment 9 WebKit Commit Bot 2018-06-22 15:13:30 PDT 
Comment on attachment 343341 [details]
Patch

Clearing flags on attachment: 343341

Committed r233102: <https://trac.webkit.org/changeset/233102>
Comment 10 WebKit Commit Bot 2018-06-22 15:13:31 PDT 
All reviewed patches have been landed.  Closing bug.
Comment 11 Radar WebKit Bug Importer 2018-06-22 15:14:20 PDT 
<rdar://problem/41383999>