Bug 190128 – [WinCairo] Enable WPT tests environment.

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

[Basuke Suzuki]

Fix Windows path issues on run-webkit-tests script. Tests itself is kept skipped in this patch.

[Basuke Suzuki]

Created attachment 351241 [details]
PATCH

Escape backslashes in the cert path before putting into JSON config file.

[youenn fablet]

Comment on attachment 351241 [details]
PATCH

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

> Tools/Scripts/webkitpy/layout_tests/servers/web_platform_test_server.py:122
> +            config_json = self._filesystem.read_text_file(config_wk_filename).replace("%CERTS_DIR%", self._filesystem.join(self._output_dir, "_wpt_certs").replace('\\', '\\\\'))

Would it work to use json.dumps instead?
Something like:
s/self._filesystem.join(self._output_dir, "_wpt_certs").replace('\\', '\\\\')/json.dumps(self._filesystem.join(self._output_dir, "_wpt_certs"))/

[Basuke Suzuki]

(In reply to youenn fablet from comment #2)
> Comment on attachment 351241 [details]
> PATCH
> 
> View in context:
> https://bugs.webkit.org/attachment.cgi?id=351241&action=review
> 
> > Tools/Scripts/webkitpy/layout_tests/servers/web_platform_test_server.py:122
> > +            config_json = self._filesystem.read_text_file(config_wk_filename).replace("%CERTS_DIR%", self._filesystem.join(self._output_dir, "_wpt_certs").replace('\\', '\\\\'))
> 
> Would it work to use json.dumps instead?
> Something like:
> s/self._filesystem.join(self._output_dir, "_wpt_certs").replace('\\',
> '\\\\')/json.dumps(self._filesystem.join(self._output_dir, "_wpt_certs"))/

That must be more universal. Thanks.

[Basuke Suzuki]

Created attachment 351352 [details]
PATCH

[Basuke Suzuki]

Created attachment 351355 [details]
PATCH

[WebKit Commit Bot]

Comment on attachment 351355 [details]
PATCH

Rejecting attachment 351355 [details] from commit-queue.

Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-03', 'apply-attachment', '--no-update', '--non-interactive', 351355, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit

Logging in as [e-mail]...
Fetching: https://bugs.webkit.org/attachment.cgi?id=351355&action=edit
Fetching: https://bugs.webkit.org/show_bug.cgi?id=190128&ctype=xml&excludefield=attachmentdata
Processing 1 patch from 1 bug.
Processing patch 351355 from bug 190128.
Fetching: https://bugs.webkit.org/attachment.cgi?id=351355
Failed to run "[u'/Volumes/Data/EWS/WebKit/Tools/Scripts/svn-apply', '--force']" exit_code: 255 cwd: /Volumes/Data/EWS/WebKit

No diff found. at /Volumes/Data/EWS/WebKit/Tools/Scripts/svn-apply line 129.
Parsed 0 diffs from patch file(s).

Failed to run "[u'/Volumes/Data/EWS/WebKit/Tools/Scripts/svn-apply', '--force']" exit_code: 255 cwd: /Volumes/Data/EWS/WebKit

Full output: https://webkit-queues.webkit.org/results/9423316

[Basuke Suzuki]

Created attachment 351357 [details]
PATCH

[Basuke Suzuki]

Created attachment 351358 [details]
PATCH

[Basuke Suzuki]

Created attachment 351359 [details]
PATCH

[WebKit Commit Bot]

Comment on attachment 351359 [details]
PATCH

Clearing flags on attachment: 351359

Committed r236718: <https://trac.webkit.org/changeset/236718>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.

[Radar WebKit Bug Importer]

<rdar://problem/44933823>