From 986011d6f2ccb6f2e366ca2efed7a5f68c4148a4 Mon Sep 17 00:00:00 2001 From: cobalt-github-releaser-bot <95661244+cobalt-github-releaser-bot@users.noreply.github.com> Date: Wed, 15 May 2024 15:05:26 -0700 Subject: [PATCH] Cherry pick PR #3131: Fix wpt tests on gcc-6-3 and clang-3-9 builds (#3254) Refer to the original PR: https://github.com/youtube/cobalt/pull/3131 The timeout value is around the same as web platform test time out value. In most builds, it will trigger wpt timeout first, and everything works expected. For gcc and clang builds, these three tests trigger taskEnvironment timeout first. Slightly increase the timeout value for taskEnvironment or decrease the timeout value for wpt seems resolve the issue. b/336564460 Co-authored-by: Sherry Zhou --- .../x64x11/clang/3.9/cobalt/configuration.py | 16 ---------------- .../linux/x64x11/gcc/6.3/cobalt/configuration.py | 16 ---------------- .../web_platform_tests/resources/testharness.js | 2 +- 3 files changed, 1 insertion(+), 33 deletions(-) diff --git a/starboard/linux/x64x11/clang/3.9/cobalt/configuration.py b/starboard/linux/x64x11/clang/3.9/cobalt/configuration.py index fa7cbfd351d7..5751d84cef6b 100644 --- a/starboard/linux/x64x11/clang/3.9/cobalt/configuration.py +++ b/starboard/linux/x64x11/clang/3.9/cobalt/configuration.py @@ -27,22 +27,6 @@ def GetTestFilters(self): filters.extend(test_filter.TestFilter(target, test) for test in tests) return filters - def GetWebPlatformTestFilters(self): - filters = super().GetWebPlatformTestFilters() - for target, tests in self.__FILTERED_WPT_TESTS.items(): - filters.extend(test_filter.TestFilter(target, test) for test in tests) - return filters - - # pylint: disable=line-too-long - __FILTERED_WPT_TESTS = { # pylint: disable=invalid-name - 'web_platform_tests': [ - # TODO(b/332367155): Re-enable web_platform_tests once fixed. - 'xhr/WebPlatformTest.Run/XMLHttpRequest_send_sync_blocks_async_htm', - 'dom/WebPlatformTest.Run/dom_nodes_MutationObserver_attributes_html', - 'html/WebPlatformTest.Run/html_dom_documents_dom_tree_accessors_Document_currentScript_sub_html', - ], - } - # A map of failing or crashing tests per target. __FILTERED_TESTS = { # pylint: disable=invalid-name 'base_unittests': [ diff --git a/starboard/linux/x64x11/gcc/6.3/cobalt/configuration.py b/starboard/linux/x64x11/gcc/6.3/cobalt/configuration.py index c86d316c610c..67e2f45568ff 100644 --- a/starboard/linux/x64x11/gcc/6.3/cobalt/configuration.py +++ b/starboard/linux/x64x11/gcc/6.3/cobalt/configuration.py @@ -29,22 +29,6 @@ def GetTestFilters(self): filters.extend(test_filter.TestFilter(target, test) for test in tests) return filters - def GetWebPlatformTestFilters(self): - filters = super().GetWebPlatformTestFilters() - for target, tests in self.__FILTERED_WPT_TESTS.items(): - filters.extend(test_filter.TestFilter(target, test) for test in tests) - return filters - - # pylint: disable=line-too-long - __FILTERED_WPT_TESTS = { # pylint: disable=invalid-name - 'web_platform_tests': [ - # TODO(b/332367155): Re-enable web_platform_tests once fixed. - 'xhr/WebPlatformTest.Run/XMLHttpRequest_send_sync_blocks_async_htm', - 'dom/WebPlatformTest.Run/dom_nodes_MutationObserver_attributes_html', - 'html/WebPlatformTest.Run/html_dom_documents_dom_tree_accessors_Document_currentScript_sub_html', - ], - } - # A map of failing or crashing tests per target. __FILTERED_TESTS = { # pylint: disable=invalid-name 'base_unittests': [ diff --git a/third_party/web_platform_tests/resources/testharness.js b/third_party/web_platform_tests/resources/testharness.js index 49f49fc4b644..04bab08f9c40 100644 --- a/third_party/web_platform_tests/resources/testharness.js +++ b/third_party/web_platform_tests/resources/testharness.js @@ -19,7 +19,7 @@ policies and contribution forms [3]. var settings = { output:true, harness_timeout:{ - "normal":10000, + "normal":9000, "long":60000 }, test_timeout:null,