Bug 43494 – mac-wk2/Skipped should be used on Windows when running regression tests

• Component: Tools / Tests
• Status: RESOLVED FIXED

[Adam Roben (:aroben)]

Nearly all of the failures in mac-wk2/Skipped are due to cross-platform issues. We should make Windows use this file, too, rather than having to maintain an entirely separate Skipped file for Windows. win-wk2/Skipped should be concatenated with the Mac file so that Windows-specific failures can be listed. (Note that this will make it impossible to run tests on Windows that aren't run on Mac, but that's probably worth the easier maintenance.)

[Adam Roben (:aroben)]

<rdar://problem/8272368>

[Jon Honeycutt]

Created attachment 63710 [details]
Patch

[Adam Roben (:aroben)]

Comment on attachment 63710 [details]
Patch

> -    foreach my $level (@platformTestHierarchy) {
> +    my @skippedFilePaths = @platformTestHierarchy;

I'd call this @skippedFileDirectories, since it contains paths to directories that contain Skipped files, rather than paths to Skipped files themselves.

> +    # Because nearly all of the skipped tests for WebKit 2 on Mac are due to
> +    # cross-platform issues, Windows will use both the Mac and Windows skipped
> +    # lists to avoid maintaining separate lists.
> +    if ($platform eq "win-wk2") {
> +        push(@skippedFilePaths, catdir($platformBaseDirectory, "mac-wk2"));
> +    }

For a single-line branch like this it's often nicer to write it using this syntax:

push(@skippedFilePaths, catdir($platformBaseDirectory, "mac-wk2")) if $platform eq "win-wk2";

r=me

[WebKit Review Bot]

http://trac.webkit.org/changeset/64876 might have broken Qt Linux Release

[Adam Barth]

This patch appears to have been landed.