diff options
| -rw-r--r-- | components/script/script_module.rs | 7 | ||||
| -rw-r--r-- | python/servo/testing_commands.py | 2 | ||||
| -rw-r--r-- | tests/wpt/metadata/html/semantics/scripting-1/the-script-element/module/error-type-1.html.ini | 4 |
3 files changed, 5 insertions, 8 deletions
diff --git a/components/script/script_module.rs b/components/script/script_module.rs index 91fca91e6a0..686583d9219 100644 --- a/components/script/script_module.rs +++ b/components/script/script_module.rs @@ -633,6 +633,7 @@ impl ModuleTree { } // 5-6. + let mut errors: Vec<ModuleError> = Vec::new(); let descendant_urls = module_tree.get_descendant_urls().borrow(); for descendant_module in descendant_urls @@ -650,13 +651,13 @@ impl ModuleTree { ModuleTree::find_first_parse_error(&global, &descendant_module, discovered_urls); // 8-4. - if child_parse_error.is_some() { - return child_parse_error; + if let Some(child_error) = child_parse_error { + errors.push(child_error); } } // Step 9. - return None; + return errors.into_iter().max(); } } diff --git a/python/servo/testing_commands.py b/python/servo/testing_commands.py index bc29955fd79..3fad465277b 100644 --- a/python/servo/testing_commands.py +++ b/python/servo/testing_commands.py @@ -331,7 +331,7 @@ class MachCommands(CommandBase): @CommandArgument('--stylo', default=False, action="store_true", help="Only handle files in the stylo tree") @CommandArgument('--force-cpp', default=False, action="store_true", help="Force CPP check") - def test_tidy(self, all_files, no_wpt, no_progress, self_test, stylo, force_cpp): + def test_tidy(self, all_files, no_progress, self_test, stylo, force_cpp=False, no_wpt=False): if self_test: return test_tidy.do_tests() else: diff --git a/tests/wpt/metadata/html/semantics/scripting-1/the-script-element/module/error-type-1.html.ini b/tests/wpt/metadata/html/semantics/scripting-1/the-script-element/module/error-type-1.html.ini deleted file mode 100644 index c756960b09d..00000000000 --- a/tests/wpt/metadata/html/semantics/scripting-1/the-script-element/module/error-type-1.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[error-type-1.html] - [network error has higher priority than parse error] - expected: FAIL - |