Do not export web-platform-test files generated by the wpt importer t…

…o assist the webkit test runner

https://bugs.webkit.org/show_bug.cgi?id=183916

Patch by Brendan McLoughlin <brendan@bocoup.com> 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):

Canonical link: https://commits.webkit.org/199502@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@229865 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog

@@ -1,3 +1,16 @@
+2018-03-22  Brendan McLoughlin  <brendan@bocoup.com>
+
+        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  <timothy_horton@apple.com>
 
         Improve readability of WebCore's OTHER_LDFLAGS

Tools/Scripts/webkitpy/w3c/test_exporter.py

@@ -154,7 +154,7 @@ def create_branch_with_patch(self, patch):
             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'])

Tools/Scripts/webkitpy/w3c/test_exporter_unittest.py

@@ -118,7 +118,7 @@ def test_export(self):
             '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://USER@github.com/USER/web-platform-tests.git',
@@ -143,7 +143,7 @@ def test_export_with_specific_branch(self):
             '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://USER@github.com/USER/web-platform-tests.git',