Bug 69360 – new-run-webkit-tests appends "/Debug" or "/Release" to $WEBKITOUTPUTDIR

• Status: RESOLVED
• Resolution: FIXED
• Component: Tools / Tests

[Raphael Kubo da Costa (:rakuco)]

I have a custom build directory location, namely $webkitroot/WebKitBuild/Debug-{qt,efl,gtk}, so I export the $WEBKITOUTPUTDIR environment variable to that location.

With old-run-webkit-tests, I can pass "--efl" and it will launch $WEBKITOUTPUTDIR/Programs/DumpRenderTree. However, if I pass "--product=efl --debug" to new-run-webkit-tests, it will call "webkit-build-directory --configuration --debug", which will return $WEBKITOUTPUTDIR/Debug. This, in turn, means n-r-w-t will try to launch $WEBKITOUTPUTDIR/Debug/Programs/DumpRenderTree, which does not exist.

The problems seems to come from the fact that webkit-build-directory does not pass "--efl" or "--gtk" to webkitdirs.pm, so the usesPerConfigurationBuildDirectory function always returns false.

[Eric Seidel (no email)]

I'm confused.  You're expecting WEBKITOUTPUTDIR to be used directly without any /Debug suffix?

[Raphael Kubo da Costa (:rakuco)]

Yes, just like o-w-r-t does -- in fact, I'd like to have from webkitdirs.pm's determineConfigurationProductDir behave the same way it does with o-r-w-t when usesPerConfigurationBuildDirectory returns true.

[Dirk Pranke]

it looks like after http://trac.webkit.org/changeset/103234 this is only true for gtk and apple win.

[Dirk Pranke]

Created attachment 148174 [details]
Patch

[Eric Seidel (no email)]

Comment on attachment 148174 [details]
Patch

I don't understand what this does.  It seems like it woule be possible to test that Config with a MockExecutive makes the right call.. so we should test that, no?

[Dirk Pranke]

(In reply to comment #5)
> (From update of attachment 148174 [details])
> I don't understand what this does.  It seems like it woule be possible to test that Config with a MockExecutive makes the right call.. so we should test that, no?

The change makes sure --gtk is passed to webkit-build-directory. In webkit-build-directory, if --gtk is passed, then it returns $WEBKITOUTPUTDIR instead of $WEBKITOUTPUTDIR/$configuration  .

I can add the mock test as you say. I was reluctant to add a test that actually verified that webkit-build-directory was doing something different for gtk specifically.

[Dirk Pranke]

Created attachment 148373 [details]
add unit test

[Eric Seidel (no email)]

Comment on attachment 148373 [details]
add unit test

OK.

[Dirk Pranke]

Committed r120863: <http://trac.webkit.org/changeset/120863>