diff options
4 files changed, 35 insertions, 8 deletions
diff --git a/python/tidy/servo_tidy/tidy.py b/python/tidy/servo_tidy/tidy.py index 1dcbd4896d1..a8e53d7804e 100644 --- a/python/tidy/servo_tidy/tidy.py +++ b/python/tidy/servo_tidy/tidy.py @@ -782,8 +782,8 @@ def collect_errors_for_files(files_to_check, checking_functions, line_checking_f yield (filename,) + error -def get_wpt_files(only_changed_files, progress): - wpt_dir = os.path.join(".", "tests", "wpt" + os.sep) +def get_wpt_files(suite, only_changed_files, progress): + wpt_dir = os.path.join(".", "tests", "wpt", suite, "") file_iter = get_file_list(os.path.join(wpt_dir), only_changed_files) (has_element, file_iter) = is_iter_empty(file_iter) if not has_element: @@ -796,12 +796,13 @@ def get_wpt_files(only_changed_files, progress): yield f[len(wpt_dir):] -def check_wpt_lint_errors(files): +def check_wpt_lint_errors(suite, files): wpt_working_dir = os.path.abspath(os.path.join(".", "tests", "wpt", "web-platform-tests")) if os.path.isdir(wpt_working_dir): site.addsitedir(wpt_working_dir) from tools.lint import lint - returncode = lint.lint(wpt_working_dir, files, output_json=False) + file_dir = os.path.abspath(os.path.join(".", "tests", "wpt", suite)) + returncode = lint.lint(file_dir, files, output_json=False) if returncode: yield ("WPT Lint Tool", "", "lint error(s) in Web Platform Tests: exit status {0}".format(returncode)) @@ -865,9 +866,12 @@ def scan(only_changed_files=False, progress=True): # check dependecy licenses dep_license_errors = check_dep_license_errors(get_dep_toml_files(only_changed_files), progress) # wpt lint checks - wpt_lint_errors = check_wpt_lint_errors(get_wpt_files(only_changed_files, progress)) + wpt_lint_errors = [ + check_wpt_lint_errors(suite, get_wpt_files(suite, only_changed_files, progress)) + for suite in ["web-platform-tests", os.path.join("mozilla", "tests")] + ] # chain all the iterators - errors = itertools.chain(config_errors, directory_errors, file_errors, dep_license_errors, wpt_lint_errors) + errors = itertools.chain(config_errors, directory_errors, file_errors, dep_license_errors, *wpt_lint_errors) error = None for error in errors: diff --git a/tests/wpt/mozilla/tests/lint.whitelist b/tests/wpt/mozilla/tests/lint.whitelist new file mode 100644 index 00000000000..483e131a143 --- /dev/null +++ b/tests/wpt/mozilla/tests/lint.whitelist @@ -0,0 +1,23 @@ +# File containing whiteslist for lint errors +# Format is: +# ERROR TYPE:file/name/pattern[:line number] +# e.g. +# TRAILING WHITESPACE:example/file.html:128 +# to allow trailing whitespace on example/file.html line 128 + +# Please don't add anything here, unless it's necessary for the test. + +## File types that should never be checked ## + +*:*.gif +*:*.jpeg +*:*.jpg +*:*.png + +## Legacy errors ## + +CONSOLE:* +OPEN-NO-MODE:* +PATH LENGTH:* +PRINT STATEMENT:* +TRAILING WHITESPACE:* diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-form-element/resources/form-action-url-iframe.html b/tests/wpt/web-platform-tests/html/semantics/forms/the-form-element/resources/form-action-url-iframe.html index 5d9599b3736..2e700514fcc 100644 --- a/tests/wpt/web-platform-tests/html/semantics/forms/the-form-element/resources/form-action-url-iframe.html +++ b/tests/wpt/web-platform-tests/html/semantics/forms/the-form-element/resources/form-action-url-iframe.html @@ -2,7 +2,7 @@ <base href="target/"></base> <form action="form-action-url-target.html"> - <input type="submit" value="Submit" /> + <input type="submit" value="Submit" /> </form> <script> diff --git a/tests/wpt/web-platform-tests/tools/lint/lint.py b/tests/wpt/web-platform-tests/tools/lint/lint.py index 2aee3da1c52..b05cfacfefc 100644 --- a/tests/wpt/web-platform-tests/tools/lint/lint.py +++ b/tests/wpt/web-platform-tests/tools/lint/lint.py @@ -42,7 +42,7 @@ def all_git_paths(repo_root): def check_path_length(repo_root, path): if len(path) + 1 > 150: - return [("PATH LENGTH", "/%s longer than maximum path length (%d > 150)" % (path, len(path) + 1), None)] + return [("PATH LENGTH", "/%s longer than maximum path length (%d > 150)" % (path, len(path) + 1), path, None)] return [] |