Title: [229865] trunk/Tools
- Revision
- 229865
- Author
- [email protected]
- Date
- 2018-03-22 14:52:51 -0700 (Thu, 22 Mar 2018)
Log Message
Do not export web-platform-test files generated by the wpt importer to assist the webkit test runner
https://bugs.webkit.org/show_bug.cgi?id=183916
Patch by Brendan McLoughlin <[email protected]> on 2018-03-22
Reviewed by Youenn Fablet.
* Scripts/webkitpy/w3c/test_exporter.py:
(TestExporter.create_branch_with_patch):
* Scripts/webkitpy/w3c/test_exporter_unittest.py:
(TestExporterTest.test_export):
(TestExporterTest.test_export_with_specific_branch):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (229864 => 229865)
--- trunk/Tools/ChangeLog 2018-03-22 21:33:53 UTC (rev 229864)
+++ trunk/Tools/ChangeLog 2018-03-22 21:52:51 UTC (rev 229865)
@@ -1,3 +1,16 @@
+2018-03-22 Brendan McLoughlin <[email protected]>
+
+ Do not export web-platform-test files generated by the wpt importer to assist the webkit test runner
+ https://bugs.webkit.org/show_bug.cgi?id=183916
+
+ Reviewed by Youenn Fablet.
+
+ * Scripts/webkitpy/w3c/test_exporter.py:
+ (TestExporter.create_branch_with_patch):
+ * Scripts/webkitpy/w3c/test_exporter_unittest.py:
+ (TestExporterTest.test_export):
+ (TestExporterTest.test_export_with_specific_branch):
+
2018-03-22 Tim Horton <[email protected]>
Improve readability of WebCore's OTHER_LDFLAGS
Modified: trunk/Tools/Scripts/webkitpy/w3c/test_exporter.py (229864 => 229865)
--- trunk/Tools/Scripts/webkitpy/w3c/test_exporter.py 2018-03-22 21:33:53 UTC (rev 229864)
+++ trunk/Tools/Scripts/webkitpy/w3c/test_exporter.py 2018-03-22 21:52:51 UTC (rev 229865)
@@ -154,7 +154,7 @@
self._git.delete_branch(self._branch_name)
self._git.checkout_new_branch(self._branch_name)
try:
- self._git.apply_mail_patch([patch, '--exclude', '*-expected.txt'])
+ self._git.apply_mail_patch([patch, '--exclude', '*-expected.txt', '--exclude', '*.worker.html', '--exclude', '*.any.html', '--exclude', '*.any.worker.html'])
except Exception as e:
_log.warning(e)
self._git.apply_mail_patch(['--abort'])
Modified: trunk/Tools/Scripts/webkitpy/w3c/test_exporter_unittest.py (229864 => 229865)
--- trunk/Tools/Scripts/webkitpy/w3c/test_exporter_unittest.py 2018-03-22 21:33:53 UTC (rev 229864)
+++ trunk/Tools/Scripts/webkitpy/w3c/test_exporter_unittest.py 2018-03-22 21:52:51 UTC (rev 229865)
@@ -118,7 +118,7 @@
'checkout master',
'reset hard origin/master',
'checkout new branch wpt-export-for-webkit-1234',
- 'apply_mail_patch patch.temp --exclude *-expected.txt',
+ 'apply_mail_patch patch.temp --exclude *-expected.txt --exclude *.worker.html --exclude *.any.html --exclude *.any.worker.html',
'commit -a -m WebKit export of https://bugs.webkit.org/show_bug.cgi?id=1234',
'remote ',
'remote add USER https://[email protected]/USER/web-platform-tests.git',
@@ -143,7 +143,7 @@
'checkout master',
'reset hard origin/master',
'checkout new branch wpt-export-for-webkit-1234',
- 'apply_mail_patch patch.temp --exclude *-expected.txt',
+ 'apply_mail_patch patch.temp --exclude *-expected.txt --exclude *.worker.html --exclude *.any.html --exclude *.any.worker.html',
'commit -a -m WebKit export of https://bugs.webkit.org/show_bug.cgi?id=1234',
'remote ',
'remote add USER https://[email protected]/USER/web-platform-tests.git',
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes