W3C test importer should sort the list of files when generating the w3c-import.log
authoryouenn.fablet@crf.canon.fr <youenn.fablet@crf.canon.fr@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 4 Feb 2015 22:02:15 +0000 (22:02 +0000)
committeryouenn.fablet@crf.canon.fr <youenn.fablet@crf.canon.fr@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 4 Feb 2015 22:02:15 +0000 (22:02 +0000)
https://bugs.webkit.org/show_bug.cgi?id=141156

Reviewed by Bem Jones-Bey.

LayoutTests/imported/w3c:

Updated web-platform-tests logs according importer file sorting.

* web-platform-tests/common/w3c-import.log:
* web-platform-tests/fonts/w3c-import.log:
* web-platform-tests/images/w3c-import.log:
* web-platform-tests/tools/runner/css/w3c-import.log:
* web-platform-tests/tools/runner/fonts/w3c-import.log:
* web-platform-tests/tools/runner/w3c-import.log:
* web-platform-tests/tools/scripts/w3c-import.log:
* web-platform-tests/tools/sslutils/w3c-import.log:
* web-platform-tests/tools/w3c-import.log:
* web-platform-tests/tools/webdriver/webdriver/w3c-import.log:

Tools:

Sort explicitly the list of imported files written in the w3c-import.log.
Removed logging of the import date.

* Scripts/webkitpy/w3c/test_importer.py:
(TestImporter.write_import_log):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@179628 268f45cc-cd09-0410-ab3c-d52691b4dbfc

14 files changed:
LayoutTests/imported/w3c/ChangeLog
LayoutTests/imported/w3c/web-platform-tests/common/w3c-import.log
LayoutTests/imported/w3c/web-platform-tests/fonts/w3c-import.log
LayoutTests/imported/w3c/web-platform-tests/images/w3c-import.log
LayoutTests/imported/w3c/web-platform-tests/tools/runner/css/w3c-import.log
LayoutTests/imported/w3c/web-platform-tests/tools/runner/fonts/w3c-import.log
LayoutTests/imported/w3c/web-platform-tests/tools/runner/w3c-import.log
LayoutTests/imported/w3c/web-platform-tests/tools/scripts/w3c-import.log
LayoutTests/imported/w3c/web-platform-tests/tools/sslutils/w3c-import.log
LayoutTests/imported/w3c/web-platform-tests/tools/w3c-import.log
LayoutTests/imported/w3c/web-platform-tests/tools/webdriver/webdriver/w3c-import.log
LayoutTests/imported/w3c/web-platform-tests/w3c-import.log
Tools/ChangeLog
Tools/Scripts/webkitpy/w3c/test_importer.py

index 32f053b..ae50fdf 100644 (file)
@@ -1,3 +1,23 @@
+2015-02-04  Youenn Fablet  <youenn.fablet@crf.canon.fr>
+
+        W3C test importer should sort the list of files when generating the w3c-import.log
+        https://bugs.webkit.org/show_bug.cgi?id=141156
+
+        Reviewed by Bem Jones-Bey.
+
+        Updated web-platform-tests logs according importer file sorting.
+
+        * web-platform-tests/common/w3c-import.log:
+        * web-platform-tests/fonts/w3c-import.log:
+        * web-platform-tests/images/w3c-import.log:
+        * web-platform-tests/tools/runner/css/w3c-import.log:
+        * web-platform-tests/tools/runner/fonts/w3c-import.log:
+        * web-platform-tests/tools/runner/w3c-import.log:
+        * web-platform-tests/tools/scripts/w3c-import.log:
+        * web-platform-tests/tools/sslutils/w3c-import.log:
+        * web-platform-tests/tools/w3c-import.log:
+        * web-platform-tests/tools/webdriver/webdriver/w3c-import.log:
+
 2015-02-03  Youenn Fablet  <youenn.fablet@crf.canon.fr>
 
         Web Platform Tests dirty a few untracked files
index bf0494c..2088825 100644 (file)
@@ -9,26 +9,24 @@ Then run the Tools/Scripts/import-w3c-tests in Webkit to reimport
 Do NOT modify or remove this file
 
 ------------------------------------------------------------------------
-Last Import: 2015-01-27 10:26
-------------------------------------------------------------------------
 Properties requiring vendor prefixes:
 None
 Property values requiring vendor prefixes:
 None
 ------------------------------------------------------------------------
 List of files:
-/LayoutTests/imported/w3c/web-platform-tests/common/canvas-tests.js
-/LayoutTests/imported/w3c/web-platform-tests/common/utils.js
-/LayoutTests/imported/w3c/web-platform-tests/common/text-plain.txt
-/LayoutTests/imported/w3c/web-platform-tests/common/reftest-wait.js
-/LayoutTests/imported/w3c/web-platform-tests/common/stringifiers.js
 /LayoutTests/imported/w3c/web-platform-tests/common/canvas-frame.css
-/LayoutTests/imported/w3c/web-platform-tests/common/css-red.txt
-/LayoutTests/imported/w3c/web-platform-tests/common/canvas-tests.css
+/LayoutTests/imported/w3c/web-platform-tests/common/canvas-index.css
 /LayoutTests/imported/w3c/web-platform-tests/common/canvas-spec.css
-/LayoutTests/imported/w3c/web-platform-tests/common/media.js
-/LayoutTests/imported/w3c/web-platform-tests/common/vendor-prefix.js
-/LayoutTests/imported/w3c/web-platform-tests/common/large.py
+/LayoutTests/imported/w3c/web-platform-tests/common/canvas-tests.css
+/LayoutTests/imported/w3c/web-platform-tests/common/canvas-tests.js
+/LayoutTests/imported/w3c/web-platform-tests/common/css-red.txt
 /LayoutTests/imported/w3c/web-platform-tests/common/failing-test.html
+/LayoutTests/imported/w3c/web-platform-tests/common/large.py
+/LayoutTests/imported/w3c/web-platform-tests/common/media.js
 /LayoutTests/imported/w3c/web-platform-tests/common/redirect.py
-/LayoutTests/imported/w3c/web-platform-tests/common/canvas-index.css
+/LayoutTests/imported/w3c/web-platform-tests/common/reftest-wait.js
+/LayoutTests/imported/w3c/web-platform-tests/common/stringifiers.js
+/LayoutTests/imported/w3c/web-platform-tests/common/text-plain.txt
+/LayoutTests/imported/w3c/web-platform-tests/common/utils.js
+/LayoutTests/imported/w3c/web-platform-tests/common/vendor-prefix.js
index 1b5f2e0..cae6a5a 100644 (file)
@@ -9,8 +9,6 @@ Then run the Tools/Scripts/import-w3c-tests in Webkit to reimport
 Do NOT modify or remove this file
 
 ------------------------------------------------------------------------
-Last Import: 2015-01-27 10:26
-------------------------------------------------------------------------
 Properties requiring vendor prefixes:
 None
 Property values requiring vendor prefixes:
index 58d70da..e5d4c20 100644 (file)
@@ -9,47 +9,45 @@ Then run the Tools/Scripts/import-w3c-tests in Webkit to reimport
 Do NOT modify or remove this file
 
 ------------------------------------------------------------------------
-Last Import: 2015-01-27 10:26
-------------------------------------------------------------------------
 Properties requiring vendor prefixes:
 None
 Property values requiring vendor prefixes:
 None
 ------------------------------------------------------------------------
 List of files:
-/LayoutTests/imported/w3c/web-platform-tests/images/blue.png
-/LayoutTests/imported/w3c/web-platform-tests/images/redtransparent.png
+/LayoutTests/imported/w3c/web-platform-tests/images/anim-gr.gif
+/LayoutTests/imported/w3c/web-platform-tests/images/anim-gr.png
 /LayoutTests/imported/w3c/web-platform-tests/images/anim-poster-gr.png
+/LayoutTests/imported/w3c/web-platform-tests/images/background.png
+/LayoutTests/imported/w3c/web-platform-tests/images/black-rectangle.png
+/LayoutTests/imported/w3c/web-platform-tests/images/blue-area.png
+/LayoutTests/imported/w3c/web-platform-tests/images/blue-border.png
+/LayoutTests/imported/w3c/web-platform-tests/images/blue.png
 /LayoutTests/imported/w3c/web-platform-tests/images/blue96x96.png
-/LayoutTests/imported/w3c/web-platform-tests/images/green-100x50.png
-/LayoutTests/imported/w3c/web-platform-tests/images/transparent50.png
-/LayoutTests/imported/w3c/web-platform-tests/images/red-zeroheight.svg
+/LayoutTests/imported/w3c/web-platform-tests/images/broken.png
 /LayoutTests/imported/w3c/web-platform-tests/images/canvas-line.png
+/LayoutTests/imported/w3c/web-platform-tests/images/fail.gif
 /LayoutTests/imported/w3c/web-platform-tests/images/ggrr-256x256.png
-/LayoutTests/imported/w3c/web-platform-tests/images/anim-gr.gif
+/LayoutTests/imported/w3c/web-platform-tests/images/green-100x50.png
 /LayoutTests/imported/w3c/web-platform-tests/images/green-16x16.png
-/LayoutTests/imported/w3c/web-platform-tests/images/blue-border.png
-/LayoutTests/imported/w3c/web-platform-tests/images/green.png
-/LayoutTests/imported/w3c/web-platform-tests/images/fail.gif
+/LayoutTests/imported/w3c/web-platform-tests/images/green-1x1.png
+/LayoutTests/imported/w3c/web-platform-tests/images/green-256x256.png
 /LayoutTests/imported/w3c/web-platform-tests/images/green-2x2.png
-/LayoutTests/imported/w3c/web-platform-tests/images/background.png
+/LayoutTests/imported/w3c/web-platform-tests/images/green.png
+/LayoutTests/imported/w3c/web-platform-tests/images/green.svg
+/LayoutTests/imported/w3c/web-platform-tests/images/grgr-256x256.png
 /LayoutTests/imported/w3c/web-platform-tests/images/movie_300_frame_0.png
-/LayoutTests/imported/w3c/web-platform-tests/images/transparent.png
+/LayoutTests/imported/w3c/web-platform-tests/images/red-16x16.png
+/LayoutTests/imported/w3c/web-platform-tests/images/red-zeroheight.svg
+/LayoutTests/imported/w3c/web-platform-tests/images/red-zerosize.svg
+/LayoutTests/imported/w3c/web-platform-tests/images/red-zerowidth.svg
+/LayoutTests/imported/w3c/web-platform-tests/images/red.png
+/LayoutTests/imported/w3c/web-platform-tests/images/redtransparent.png
 /LayoutTests/imported/w3c/web-platform-tests/images/rgrg-256x256.png
-/LayoutTests/imported/w3c/web-platform-tests/images/black-rectangle.png
-/LayoutTests/imported/w3c/web-platform-tests/images/green-1x1.png
+/LayoutTests/imported/w3c/web-platform-tests/images/rrgg-256x256.png
 /LayoutTests/imported/w3c/web-platform-tests/images/smiley.png
-/LayoutTests/imported/w3c/web-platform-tests/images/red.png
 /LayoutTests/imported/w3c/web-platform-tests/images/threecolors.png
-/LayoutTests/imported/w3c/web-platform-tests/images/anim-gr.png
-/LayoutTests/imported/w3c/web-platform-tests/images/rrgg-256x256.png
-/LayoutTests/imported/w3c/web-platform-tests/images/green.svg
-/LayoutTests/imported/w3c/web-platform-tests/images/yellow75.png
+/LayoutTests/imported/w3c/web-platform-tests/images/transparent.png
+/LayoutTests/imported/w3c/web-platform-tests/images/transparent50.png
 /LayoutTests/imported/w3c/web-platform-tests/images/yellow.png
-/LayoutTests/imported/w3c/web-platform-tests/images/red-zerosize.svg
-/LayoutTests/imported/w3c/web-platform-tests/images/red-zerowidth.svg
-/LayoutTests/imported/w3c/web-platform-tests/images/green-256x256.png
-/LayoutTests/imported/w3c/web-platform-tests/images/grgr-256x256.png
-/LayoutTests/imported/w3c/web-platform-tests/images/red-16x16.png
-/LayoutTests/imported/w3c/web-platform-tests/images/blue-area.png
-/LayoutTests/imported/w3c/web-platform-tests/images/broken.png
+/LayoutTests/imported/w3c/web-platform-tests/images/yellow75.png
index 4c59771..33238a3 100644 (file)
@@ -9,13 +9,11 @@ Then run the Tools/Scripts/import-w3c-tests in Webkit to reimport
 Do NOT modify or remove this file
 
 ------------------------------------------------------------------------
-Last Import: 2015-01-27 10:26
-------------------------------------------------------------------------
 Properties requiring vendor prefixes:
 None
 Property values requiring vendor prefixes:
 None
 ------------------------------------------------------------------------
 List of files:
-/LayoutTests/imported/w3c/web-platform-tests/tools/runner/css/bootstrap.min.css
 /LayoutTests/imported/w3c/web-platform-tests/tools/runner/css/bootstrap-theme.min.css
+/LayoutTests/imported/w3c/web-platform-tests/tools/runner/css/bootstrap.min.css
index f762ab1..90840f2 100644 (file)
@@ -9,15 +9,13 @@ Then run the Tools/Scripts/import-w3c-tests in Webkit to reimport
 Do NOT modify or remove this file
 
 ------------------------------------------------------------------------
-Last Import: 2015-01-27 10:26
-------------------------------------------------------------------------
 Properties requiring vendor prefixes:
 None
 Property values requiring vendor prefixes:
 None
 ------------------------------------------------------------------------
 List of files:
+/LayoutTests/imported/w3c/web-platform-tests/tools/runner/fonts/glyphicons-halflings-regular.eot
 /LayoutTests/imported/w3c/web-platform-tests/tools/runner/fonts/glyphicons-halflings-regular.svg
-/LayoutTests/imported/w3c/web-platform-tests/tools/runner/fonts/glyphicons-halflings-regular.woff
 /LayoutTests/imported/w3c/web-platform-tests/tools/runner/fonts/glyphicons-halflings-regular.ttf
-/LayoutTests/imported/w3c/web-platform-tests/tools/runner/fonts/glyphicons-halflings-regular.eot
+/LayoutTests/imported/w3c/web-platform-tests/tools/runner/fonts/glyphicons-halflings-regular.woff
index 0fd90c8..e6a8572 100644 (file)
@@ -9,17 +9,15 @@ Then run the Tools/Scripts/import-w3c-tests in Webkit to reimport
 Do NOT modify or remove this file
 
 ------------------------------------------------------------------------
-Last Import: 2015-01-27 10:26
-------------------------------------------------------------------------
 Properties requiring vendor prefixes:
 None
 Property values requiring vendor prefixes:
 None
 ------------------------------------------------------------------------
 List of files:
+/LayoutTests/imported/w3c/web-platform-tests/tools/runner/logo.svg
+/LayoutTests/imported/w3c/web-platform-tests/tools/runner/report.css
 /LayoutTests/imported/w3c/web-platform-tests/tools/runner/report.py
 /LayoutTests/imported/w3c/web-platform-tests/tools/runner/runner.css
 /LayoutTests/imported/w3c/web-platform-tests/tools/runner/runner.js
-/LayoutTests/imported/w3c/web-platform-tests/tools/runner/logo.svg
 /LayoutTests/imported/w3c/web-platform-tests/tools/runner/update_manifest.py
-/LayoutTests/imported/w3c/web-platform-tests/tools/runner/report.css
index d3e4bce..a2606f6 100644 (file)
@@ -9,25 +9,23 @@ Then run the Tools/Scripts/import-w3c-tests in Webkit to reimport
 Do NOT modify or remove this file
 
 ------------------------------------------------------------------------
-Last Import: 2015-01-27 10:26
-------------------------------------------------------------------------
 Properties requiring vendor prefixes:
 None
 Property values requiring vendor prefixes:
 None
 ------------------------------------------------------------------------
 List of files:
-/LayoutTests/imported/w3c/web-platform-tests/tools/scripts/lint.py
-/LayoutTests/imported/w3c/web-platform-tests/tools/scripts/manifest.js
-/LayoutTests/imported/w3c/web-platform-tests/tools/scripts/id2path.json
-/LayoutTests/imported/w3c/web-platform-tests/tools/scripts/update_html5lib_tests.py
 /LayoutTests/imported/w3c/web-platform-tests/tools/scripts/__init__.py
+/LayoutTests/imported/w3c/web-platform-tests/tools/scripts/_env.py
 /LayoutTests/imported/w3c/web-platform-tests/tools/scripts/html5lib_test.xml
-/LayoutTests/imported/w3c/web-platform-tests/tools/scripts/lint.whitelist
-/LayoutTests/imported/w3c/web-platform-tests/tools/scripts/toc.js
 /LayoutTests/imported/w3c/web-platform-tests/tools/scripts/html5lib_test_fragment.xml
-/LayoutTests/imported/w3c/web-platform-tests/tools/scripts/update-directory-structure.js
+/LayoutTests/imported/w3c/web-platform-tests/tools/scripts/id2path.js
+/LayoutTests/imported/w3c/web-platform-tests/tools/scripts/id2path.json
+/LayoutTests/imported/w3c/web-platform-tests/tools/scripts/lint.py
+/LayoutTests/imported/w3c/web-platform-tests/tools/scripts/lint.whitelist
+/LayoutTests/imported/w3c/web-platform-tests/tools/scripts/manifest.js
 /LayoutTests/imported/w3c/web-platform-tests/tools/scripts/manifest.py
 /LayoutTests/imported/w3c/web-platform-tests/tools/scripts/package.json
-/LayoutTests/imported/w3c/web-platform-tests/tools/scripts/_env.py
-/LayoutTests/imported/w3c/web-platform-tests/tools/scripts/id2path.js
+/LayoutTests/imported/w3c/web-platform-tests/tools/scripts/toc.js
+/LayoutTests/imported/w3c/web-platform-tests/tools/scripts/update-directory-structure.js
+/LayoutTests/imported/w3c/web-platform-tests/tools/scripts/update_html5lib_tests.py
index 1dd6e27..2ec3731 100644 (file)
@@ -9,15 +9,13 @@ Then run the Tools/Scripts/import-w3c-tests in Webkit to reimport
 Do NOT modify or remove this file
 
 ------------------------------------------------------------------------
-Last Import: 2015-01-27 10:26
-------------------------------------------------------------------------
 Properties requiring vendor prefixes:
 None
 Property values requiring vendor prefixes:
 None
 ------------------------------------------------------------------------
 List of files:
-/LayoutTests/imported/w3c/web-platform-tests/tools/sslutils/openssl.py
 /LayoutTests/imported/w3c/web-platform-tests/tools/sslutils/__init__.py
 /LayoutTests/imported/w3c/web-platform-tests/tools/sslutils/base.py
+/LayoutTests/imported/w3c/web-platform-tests/tools/sslutils/openssl.py
 /LayoutTests/imported/w3c/web-platform-tests/tools/sslutils/pregenerated.py
index 0842c82..5b85391 100644 (file)
@@ -9,8 +9,6 @@ Then run the Tools/Scripts/import-w3c-tests in Webkit to reimport
 Do NOT modify or remove this file
 
 ------------------------------------------------------------------------
-Last Import: 2015-01-27 10:26
-------------------------------------------------------------------------
 Properties requiring vendor prefixes:
 None
 Property values requiring vendor prefixes:
index b2fb02d..7fb2d47 100644 (file)
@@ -9,21 +9,19 @@ Then run the Tools/Scripts/import-w3c-tests in Webkit to reimport
 Do NOT modify or remove this file
 
 ------------------------------------------------------------------------
-Last Import: 2015-01-27 10:26
-------------------------------------------------------------------------
 Properties requiring vendor prefixes:
 None
 Property values requiring vendor prefixes:
 None
 ------------------------------------------------------------------------
 List of files:
-/LayoutTests/imported/w3c/web-platform-tests/tools/webdriver/webdriver/driver.py
-/LayoutTests/imported/w3c/web-platform-tests/tools/webdriver/webdriver/wait.py
 /LayoutTests/imported/w3c/web-platform-tests/tools/webdriver/webdriver/__init__.py
+/LayoutTests/imported/w3c/web-platform-tests/tools/webdriver/webdriver/alert.py
 /LayoutTests/imported/w3c/web-platform-tests/tools/webdriver/webdriver/capabilities.py
+/LayoutTests/imported/w3c/web-platform-tests/tools/webdriver/webdriver/command.py
+/LayoutTests/imported/w3c/web-platform-tests/tools/webdriver/webdriver/driver.py
+/LayoutTests/imported/w3c/web-platform-tests/tools/webdriver/webdriver/exceptions.py
 /LayoutTests/imported/w3c/web-platform-tests/tools/webdriver/webdriver/keys.py
 /LayoutTests/imported/w3c/web-platform-tests/tools/webdriver/webdriver/searchcontext.py
-/LayoutTests/imported/w3c/web-platform-tests/tools/webdriver/webdriver/alert.py
-/LayoutTests/imported/w3c/web-platform-tests/tools/webdriver/webdriver/exceptions.py
-/LayoutTests/imported/w3c/web-platform-tests/tools/webdriver/webdriver/command.py
+/LayoutTests/imported/w3c/web-platform-tests/tools/webdriver/webdriver/wait.py
 /LayoutTests/imported/w3c/web-platform-tests/tools/webdriver/webdriver/webelement.py
index 0547d68..da3efd6 100644 (file)
@@ -9,8 +9,6 @@ Then run the Tools/Scripts/import-w3c-tests in Webkit to reimport
 Do NOT modify or remove this file
 
 ------------------------------------------------------------------------
-Last Import: 2015-02-02 11:42
-------------------------------------------------------------------------
 Properties requiring vendor prefixes:
 None
 Property values requiring vendor prefixes:
@@ -20,7 +18,6 @@ List of files:
 /LayoutTests/imported/w3c/web-platform-tests/CONTRIBUTING.md
 /LayoutTests/imported/w3c/web-platform-tests/LICENSE
 /LayoutTests/imported/w3c/web-platform-tests/README.md
-/LayoutTests/imported/w3c/web-platform-tests/SUBMODULES
 /LayoutTests/imported/w3c/web-platform-tests/config.default.json
 /LayoutTests/imported/w3c/web-platform-tests/serve.py
 /LayoutTests/imported/w3c/web-platform-tests/server-side.md
index b47b03d..a2d6915 100644 (file)
@@ -1,3 +1,16 @@
+2015-02-04  Youenn Fablet  <youenn.fablet@crf.canon.fr>
+
+        W3C test importer should sort the list of files when generating the w3c-import.log
+        https://bugs.webkit.org/show_bug.cgi?id=141156
+
+        Reviewed by Bem Jones-Bey.
+
+        Sort explicitly the list of imported files written in the w3c-import.log.
+        Removed logging of the import date.
+
+        * Scripts/webkitpy/w3c/test_importer.py:
+        (TestImporter.write_import_log):
+
 2015-02-04  Daniel Bates  <dabates@apple.com>
 
         test-webkitpy fails on Mac without iphoneos SDK
index 548c98e..e1f4d30 100644 (file)
@@ -385,8 +385,6 @@ class TestImporter(object):
     def write_import_log(self, import_directory, file_list, prop_list, property_values_list):
         """ Writes a w3c-import.log file in each directory with imported files. """
 
-        now = datetime.datetime.now()
-
         import_log = open(os.path.join(import_directory, 'w3c-import.log'), 'w')
         import_log.write('The tests in this directory were imported from the W3C repository.\n')
         import_log.write('Do NOT modify these tests directly in Webkit.\n')
@@ -397,8 +395,6 @@ class TestImporter(object):
         import_log.write('Then run the Tools/Scripts/import-w3c-tests in Webkit to reimport\n\n')
         import_log.write('Do NOT modify or remove this file\n\n')
         import_log.write('------------------------------------------------------------------------\n')
-        import_log.write('Last Import: ' + now.strftime('%Y-%m-%d %H:%M') + '\n')
-        import_log.write('------------------------------------------------------------------------\n')
         import_log.write('Properties requiring vendor prefixes:\n')
         if prop_list:
             for prop in prop_list:
@@ -413,7 +409,7 @@ class TestImporter(object):
             import_log.write('None\n')
         import_log.write('------------------------------------------------------------------------\n')
         import_log.write('List of files:\n')
-        for item in file_list:
+        for item in sorted(file_list):
             import_log.write(item + '\n')
 
         import_log.close()