| Summary: | [WinCairo] ImageDiff should use DLLLauncher | ||||||||
|---|---|---|---|---|---|---|---|---|---|
| Product: | WebKit | Reporter: | Ross Kirsling <ross.kirsling> | ||||||
| Component: | New Bugs | Assignee: | Ross Kirsling <ross.kirsling> | ||||||
| Status: | RESOLVED FIXED | ||||||||
| Severity: | Normal | CC: | achristensen, bfulgham, commit-queue, don.olmstead, pvollan, webkit-bug-importer | ||||||
| Priority: | P2 | Keywords: | InRadar | ||||||
| Version: | WebKit Nightly Build | ||||||||
| Hardware: | Unspecified | ||||||||
| OS: | Unspecified | ||||||||
| Attachments: |
|
||||||||
|
Description
Ross Kirsling
2018-06-22 09:50:07 PDT
Created attachment 343334 [details]
Patch
Could you also make this change for AppleWin? (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. :) (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. Created attachment 343341 [details]
Patch
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? (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.) 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 on attachment 343341 [details] Patch Clearing flags on attachment: 343341 Committed r233102: <https://trac.webkit.org/changeset/233102> All reviewed patches have been landed. Closing bug. |