diff --git a/python/tidy/servo_tidy/tidy.py b/python/tidy/servo_tidy/tidy.py
index 81c360aa190a..61251983e191 100644
--- a/python/tidy/servo_tidy/tidy.py
+++ b/python/tidy/servo_tidy/tidy.py
@@ -27,7 +27,7 @@
# File patterns to include in the non-WPT tidy check.
FILE_PATTERNS_TO_CHECK = ["*.rs", "*.rc", "*.cpp", "*.c",
"*.h", "Cargo.lock", "*.py", "*.sh",
- "*.toml", "*.webidl", "*.json"]
+ "*.toml", "*.webidl", "*.json", "*.html"]
# File patterns that are ignored for all tidy and lint checks.
FILE_PATTERNS_TO_IGNORE = ["*.#*", "*.pyc"]
@@ -44,6 +44,11 @@
os.path.join(".", "tests", "wpt", "metadata-css", "MANIFEST.json"),
os.path.join(".", "components", "script", "dom", "webidls", "ForceTouchEvent.webidl"),
os.path.join(".", "support", "android", "openssl.sh"),
+ # Ignore those files since the issues reported are on purpose
+ os.path.join(".", "tests", "html", "bad-line-ends.html"),
+ os.path.join(".", "tests", "unit", "net", "parsable_mime", "text"),
+ os.path.join(".", "tests", "wpt", "mozilla", "tests", "css", "fonts"),
+ os.path.join(".", "tests", "wpt", "mozilla", "tests", "css", "pre_with_tab.html"),
# FIXME(pcwalton, #11679): This is a workaround for a tidy error on the quoted string
# `"__TEXT,_info_plist"` inside an attribute.
os.path.join(".", "components", "servo", "platform", "macos", "mod.rs"),
@@ -148,7 +153,7 @@ def filter_files(start_dir, only_changed_files, progress):
def check_license(file_name, lines):
- if any(file_name.endswith(ext) for ext in (".toml", ".lock", ".json")):
+ if any(file_name.endswith(ext) for ext in (".toml", ".lock", ".json", ".html")):
raise StopIteration
while lines and (lines[0].startswith(EMACS_HEADER) or lines[0].startswith(VIM_HEADER)):
lines = lines[1:]
@@ -168,7 +173,7 @@ def check_modeline(file_name, lines):
def check_length(file_name, idx, line):
- if file_name.endswith(".lock") or file_name.endswith(".json"):
+ if file_name.endswith(".lock") or file_name.endswith(".json") or file_name.endswith(".html"):
raise StopIteration
# Prefer shorter lines when shell scripting.
if file_name.endswith(".sh"):
@@ -672,7 +677,7 @@ def collect_errors_for_files(files_to_check, checking_functions, line_checking_f
def get_wpt_files(only_changed_files, progress):
- wpt_dir = os.path.join(".", "tests", "wpt", "web-platform-tests" + os.sep)
+ wpt_dir = os.path.join(".", "tests", "wpt" + os.sep)
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:
diff --git a/tests/html/acid1.html b/tests/html/acid1.html
index 88d5b325bd2b..c78419966e81 100644
--- a/tests/html/acid1.html
+++ b/tests/html/acid1.html
@@ -1,11 +1,11 @@
-
- display/box/float/clear test
-
-
-
-
-
- -
- toggle
-
- -
-
- -
- the way
-
- -
-
- the world ends
-
-
-
- -
- i grow old
-
- -
- pluot?
-
-
-
-
- bar maids,
-
-
-
- sing to me, erbarme dich
-
-
-
-
- This is a nonsensical document, but syntactically valid HTML 4.0. All
- 100%-conformant CSS1 agents should be able to render the document
+
+
+
+ -
+ toggle
+
+ -
+
+ -
+ the way
+
+ -
+
+ the world ends
+
+
+
+ -
+ i grow old
+
+ -
+ pluot?
+
+
+
+
+ bar maids,
+
+
+
+ sing to me, erbarme dich
+
+
+
+
+ This is a nonsensical document, but syntactically valid HTML 4.0. All
+ 100%-conformant CSS1 agents should be able to render the document
elements above this paragraph indistinguishably (to the pixel) from this
-
- reference rendering,
- (except font rasterization and form widgets). All discrepancies
-should be traceable to CSS1 implementation shortcomings. Once you have
-finished evaluating this test, you can return to the parent page.
-
-
+
+ reference rendering,
+ (except font rasterization and form widgets). All discrepancies
+should be traceable to CSS1 implementation shortcomings. Once you have
+finished evaluating this test, you can return to the parent page.
+
+
diff --git a/tests/html/acid2.html b/tests/html/acid2.html
index 9c7712a22f79..8c8c18001696 100755
--- a/tests/html/acid2.html
+++ b/tests/html/acid2.html
@@ -142,4 +142,4 @@ Hello World!
-
