<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[206993] trunk/Tools</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/206993">206993</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-10-10 03:27:27 -0700 (Mon, 10 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>W3C test downloader should be able to import specific files/sub-directories in a skipped directory
https://bugs.webkit.org/show_bug.cgi?id=161789
Patch by Youenn Fablet <youenn@apple.com> on 2016-10-10
Reviewed by Ryosuke Niwa.
Removed tests_directory option and corresponding test.
This option was allowing to import a sub-directory from a test repository.
We can readd it if necessary.
Adding support for finer-grained import rules.
Previously skipped directories were fully removed.
Now, directories may be skipped but sub directories of them may be imported.
This currently happens in web-platform-tests repo.
* Scripts/webkitpy/w3c/test_downloader.py:
(TestDownloader._add_test_suite_paths): Removing tests_directory option.
(TestDownloader.copy_tests): Refactoring file copy by generating the list of all directories for which direct files should be imported.
(TestDownloader.copy_tests.should_copy_dir):
(TestDownloader.copy_tests.should_copy_file):
* Scripts/webkitpy/w3c/test_importer_unittest.py:
(TestImporterTest.test_tests_directory): Deleted.
(TestImporterTest.test_skip_test_import): Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpyw3ctest_downloaderpy">trunk/Tools/Scripts/webkitpy/w3c/test_downloader.py</a></li>
<li><a href="#trunkToolsScriptswebkitpyw3ctest_importer_unittestpy">trunk/Tools/Scripts/webkitpy/w3c/test_importer_unittest.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (206992 => 206993)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-10-10 09:03:09 UTC (rev 206992)
+++ trunk/Tools/ChangeLog 2016-10-10 10:27:27 UTC (rev 206993)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2016-10-10 Youenn Fablet <youenn@apple.com>
+
+ W3C test downloader should be able to import specific files/sub-directories in a skipped directory
+ https://bugs.webkit.org/show_bug.cgi?id=161789
+
+ Reviewed by Ryosuke Niwa.
+
+ Removed tests_directory option and corresponding test.
+ This option was allowing to import a sub-directory from a test repository.
+ We can readd it if necessary.
+
+ Adding support for finer-grained import rules.
+ Previously skipped directories were fully removed.
+ Now, directories may be skipped but sub directories of them may be imported.
+ This currently happens in web-platform-tests repo.
+
+ * Scripts/webkitpy/w3c/test_downloader.py:
+ (TestDownloader._add_test_suite_paths): Removing tests_directory option.
+ (TestDownloader.copy_tests): Refactoring file copy by generating the list of all directories for which direct files should be imported.
+ (TestDownloader.copy_tests.should_copy_dir):
+ (TestDownloader.copy_tests.should_copy_file):
+ * Scripts/webkitpy/w3c/test_importer_unittest.py:
+ (TestImporterTest.test_tests_directory): Deleted.
+ (TestImporterTest.test_skip_test_import): Added.
+
</ins><span class="cx"> 2016-10-09 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Make validate-committer-lists show inactive reviewers
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyw3ctest_downloaderpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/w3c/test_downloader.py (206992 => 206993)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/w3c/test_downloader.py 2016-10-10 09:03:09 UTC (rev 206992)
+++ trunk/Tools/Scripts/webkitpy/w3c/test_downloader.py 2016-10-10 10:27:27 UTC (rev 206993)
</span><span class="lines">@@ -26,7 +26,6 @@
</span><span class="cx"> """
</span><span class="cx"> This script downloads W3C test repositories.
</span><span class="cx"> """
</span><del>-#FIXME: Implement submodules extraction to prepare for generation of LayoutTests/imported/w3C/resources/WPTModules
</del><span class="cx">
</span><span class="cx"> import json
</span><span class="cx"> import logging
</span><span class="lines">@@ -104,12 +103,11 @@
</span><span class="cx"> elif 'PASS' in line.expectations:
</span><span class="cx"> self.paths_to_import.append(line.name)
</span><span class="cx">
</span><del>- def _add_test_suite_paths(self, test_paths, directory, webkit_path, tests_directory):
- complete_directory = self._filesystem.join(directory, tests_directory)
- for name in self._filesystem.listdir(complete_directory):
- original_path = self._filesystem.join(webkit_path, tests_directory, name)
</del><ins>+ def _add_test_suite_paths(self, test_paths, directory, webkit_path):
+ for name in self._filesystem.listdir(directory):
+ original_path = self._filesystem.join(webkit_path, name)
</ins><span class="cx"> if not name.startswith('.') and not original_path in self.paths_to_skip:
</span><del>- test_paths.append((original_path, self._filesystem.join(webkit_path, name)))
</del><ins>+ test_paths.append(original_path)
</ins><span class="cx">
</span><span class="cx"> def _empty_directory(self, directory):
</span><span class="cx"> if self._filesystem.exists(directory):
</span><span class="lines">@@ -123,36 +121,58 @@
</span><span class="cx"> copy_paths = []
</span><span class="cx"> if test_paths:
</span><span class="cx"> for path in test_paths:
</span><del>- copy_paths.append((path, path))
</del><ins>+ copy_paths.append(path)
</ins><span class="cx"> for path in self.paths_to_import:
</span><del>- copy_paths.append((path, path))
</del><ins>+ copy_paths.append(path)
</ins><span class="cx"> else:
</span><span class="cx"> for test_repository in self.test_repositories:
</span><del>- self._add_test_suite_paths(copy_paths, self._filesystem.join(self.repository_directory, test_repository['name']), test_repository['name'],
- test_repository['tests_directory'] if ('tests_directory' in test_repository) else '')
</del><ins>+ self._add_test_suite_paths(copy_paths, self._filesystem.join(self.repository_directory, test_repository['name']), test_repository['name'])
</ins><span class="cx"> # Handling of tests marked as [ Pass ] in expectations file.
</span><span class="cx"> for path in self.paths_to_import:
</span><del>- if not (path, path) in copy_paths:
- copy_paths.append((path, path))
</del><ins>+ if not path in copy_paths:
+ copy_paths.append(path)
</ins><span class="cx">
</span><del>- for paths in copy_paths:
- source_path = self._filesystem.join(self.repository_directory, paths[0])
- destination_path = self._filesystem.join(destination_directory, paths[1])
- if not self._filesystem.exists(source_path):
- _log.error('Cannot copy %s' % source_path)
- elif self._filesystem.isdir(source_path):
- self._filesystem.copytree(source_path, destination_path)
- else:
- self._filesystem.maybe_make_directory(self._filesystem.dirname(destination_path))
- self._filesystem.copyfile(source_path, destination_path)
</del><ins>+ def longest_path(filesystem, paths):
+ longest_matching_path = ""
+ for path in paths:
+ if path.startswith(longest_matching_path):
+ longest_matching_path = path
+ return longest_matching_path
</ins><span class="cx">
</span><del>- for path in self.paths_to_skip:
- destination_path = self._filesystem.join(destination_directory, path)
- if self._filesystem.isfile(destination_path):
- self._filesystem.remove(destination_path)
- elif self._filesystem.isdir(destination_path):
- self._filesystem.rmtree(destination_path)
</del><ins>+ def should_copy_dir(filesystem, directory):
+ relative_path = self._filesystem.relpath(directory, self.repository_directory)
+ if relative_path == ".":
+ return True
</ins><span class="cx">
</span><ins>+ potential_copy_paths = [copy_directory for copy_directory in copy_paths if relative_path.startswith(copy_directory)]
+ if (not potential_copy_paths):
+ return False
+
+ potential_skip_paths = [skip_directory for skip_directory in self.paths_to_skip if relative_path.startswith(skip_directory)]
+ if (not potential_skip_paths):
+ return True
+
+ longest_copy_path = longest_path(filesystem, potential_copy_paths)
+ longest_skip_path = longest_path(filesystem, potential_skip_paths)
+ return longest_copy_path.startswith(longest_skip_path)
+
+ # Compute directories for which we should copy direct children
+ directories_to_copy = self._filesystem.dirs_under(self.repository_directory, should_copy_dir)
+
+ def should_copy_file(filesystem, dirname, filename):
+ full_path = filesystem.join(dirname, filename)
+ relative_path = self._filesystem.relpath(full_path, self.repository_directory)
+ if relative_path in copy_paths:
+ return True
+ if relative_path in self.paths_to_skip:
+ return False
+ return dirname in directories_to_copy
+
+ for source_path in self._filesystem.files_under(self.repository_directory, file_filter=should_copy_file):
+ destination_path = self._filesystem.join(destination_directory, self._filesystem.relpath(source_path, self.repository_directory))
+ self._filesystem.maybe_make_directory(self._filesystem.dirname(destination_path))
+ self._filesystem.copyfile(source_path, destination_path)
+
</ins><span class="cx"> def _git_submodules_description(self, test_repository):
</span><span class="cx"> directory = self._filesystem.join(self.repository_directory, test_repository['name'])
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyw3ctest_importer_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/w3c/test_importer_unittest.py (206992 => 206993)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/w3c/test_importer_unittest.py 2016-10-10 09:03:09 UTC (rev 206992)
+++ trunk/Tools/Scripts/webkitpy/w3c/test_importer_unittest.py 2016-10-10 10:27:27 UTC (rev 206993)
</span><span class="lines">@@ -164,27 +164,37 @@
</span><span class="cx"> # FIXME: Mock-up of git cannot use submodule command, hence the json file is empty, but still it should be created
</span><span class="cx"> #self.assertTrue('https://github.com/w3c/testharness.js/archive/db4d391a69877d4a1eaaf51d1725c99a5b8ed84.tar.gz' in fs.read_text_file('/mock-checkout/LayoutTests/w3c/resources/web-platform-tests-modules.json'))
</span><span class="cx">
</span><del>- def test_tests_directory(self):
</del><ins>+ def test_skip_test_import(self):
</ins><span class="cx"> FAKE_FILES = {
</span><span class="cx"> '/mock-checkout/WebKitBuild/w3c-tests/streams-api/reference-implementation/web-platform-tests/test.html': '<!doctype html><script src="/resources/testharness.js"></script><script src="/resources/testharnessreport.js"></script>',
</span><del>- '/mock-checkout/LayoutTests/imported/w3c/resources/TestRepositories': '''
</del><ins>+ '/mock-checkout/LayoutTests/imported/w3c/resources/TestRepositories': '''
</ins><span class="cx"> [
</span><span class="cx"> {
</span><del>- "name": "streams-api",
- "url": "https://github.com/whatwg/streams.git",
</del><ins>+ "name": "web-platform-tests",
+ "url": "https://github.com/myrepo",
</ins><span class="cx"> "revision": "7cc96dd",
</span><del>- "tests_directory": "reference-implementation/web-platform-tests",
</del><span class="cx"> "paths_to_skip": [],
</span><span class="cx"> "paths_to_import": [],
</span><span class="cx"> "import_options": []
</span><span class="cx"> }
</span><del>-]
-'''}
</del><ins>+]''',
+ '/mock-checkout/LayoutTests/imported/w3c/resources/ImportExpectations': '''
+web-platform-tests/dir-to-skip [ Skip ]
+web-platform-tests/dir-to-skip/dir-to-import [ Pass ]
+web-platform-tests/dir-to-skip/file-to-import.html [ Pass ]
+''',
+ '/mock-checkout/WebKitBuild/w3c-tests/web-platform-tests/dir-to-skip/test-to-skip.html': 'to be skipped',
+ '/mock-checkout/WebKitBuild/w3c-tests/web-platform-tests/dir-to-skip/dir-to-import/test-to-import.html': 'to be imported',
+ '/mock-checkout/WebKitBuild/w3c-tests/web-platform-tests/dir-to-skip/dir-to-not-import/test-to-not-import.html': 'to be skipped',
+ '/mock-checkout/WebKitBuild/w3c-tests/web-platform-tests/dir-to-skip/file-to-import.html': 'to be imported',
+ }
</ins><span class="cx">
</span><del>- fs = self.import_downloaded_tests(['--no-fetch', '--import-all', '-d', 'w3c'], FAKE_FILES)
</del><ins>+ fs = self.import_downloaded_tests(['--no-fetch', '-d', 'w3c'], FAKE_FILES)
</ins><span class="cx">
</span><del>- self.assertFalse(fs.exists('/mock-checkout/LayoutTests/w3c/streams-api/reference-implementation/web-platform-tests/test.html'))
- self.assertTrue(fs.exists('/mock-checkout/LayoutTests/w3c/streams-api/test.html'))
</del><ins>+ self.assertTrue(fs.exists('/mock-checkout/LayoutTests/w3c/web-platform-tests/dir-to-skip/file-to-import.html'))
+ self.assertTrue(fs.exists('/mock-checkout/LayoutTests/w3c/web-platform-tests/dir-to-skip/dir-to-import/test-to-import.html'))
+ self.assertFalse(fs.exists('/mock-checkout/LayoutTests/w3c/web-platform-tests/dir-to-skip/dir-to-not-import/test-to-not-import.html'))
+ self.assertFalse(fs.exists('/mock-checkout/LayoutTests/w3c/web-platform-tests/dir-to-skip/test-to-skip.html'))
</ins><span class="cx">
</span><span class="cx"> def test_clean_directory_option(self):
</span><span class="cx"> FAKE_FILES = {
</span></span></pre>
</div>
</div>
</body>
</html>