[webkit-reviews] review denied: [Bug 210548] [Flatpak SDK] Not fully hooked in BuildSlaveSupport : [Attachment 396548] Patch

[bugzilla-daemon at webkit.org]

Carlos Alberto Lopez Perez <clopez at igalia.com> has denied Philippe Normand
<pnormand at igalia.com>'s request for review:
Bug 210548: [Flatpak SDK] Not fully hooked in BuildSlaveSupport
https://bugs.webkit.org/show_bug.cgi?id=210548

Attachment 396548: Patch

https://bugs.webkit.org/attachment.cgi?id=396548&action=review




--- Comment #8 from Carlos Alberto Lopez Perez <clopez at igalia.com> ---
Comment on attachment 396548
  --> https://bugs.webkit.org/attachment.cgi?id=396548
Patch

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

> Tools/BuildSlaveSupport/built-product-archive:124
> +	   prefixDirectory = os.path.join(archiveDir, platform.upper(),
configuration.title())
> +	   if os.environ.get("WEBKIT_JHBUILD", "0") == "0" and
os.path.isdir(prefixDirectory):

This won't work on the first run for the test bot with flatpak because
WebKitBuild/$PORT/$Config doesn't exist yet.
Remember that the test bot doesn't build, it just runs the update-flatpak step
and then downloads the built product and runs the tests.
We have to check here for the userflatpak directory, not for the build one.

> Tools/BuildSlaveSupport/built-product-archive:253
> -	   if createZipFromList(neededDirectories, configuration,
excludePattern='*.o'):
> +	   if createZipFromList(neededDirectories, platform, configuration,
excludePattern='*.o'):

I don't think patching the createZipFromList() function its the best approach.
Instead of that I think we need to fix the function
webkitBuildDirectoryForConfigurationAndPlatform() to output the right
directories.
This its also specially important because we need to fix also the directory for
the extract command. See:

This command should create a zip file from the build directory (its what the
build-only bot runs)
python Tools/BuildSlaveSupport/built-product-archive --platform=gtk --release
archive


And this other should _wipe_ the build directory and then uncompress the
contents of the previous zip file there (its what the test-only bot runs after
downloading the zip in a previous step)
python Tools/BuildSlaveSupport/built-product-archive --platform=gtk --release
extract