Re-enable most tests on FROZEN_CACHE

Author: kainino0x

test/test_browser.py

@@ -26,6 +26,7 @@
 from common import HttpServerThread, requires_dev_dependency
 from tools import shared
 from tools import ports
+from tools.shared import config
 from tools.shared import EMCC, WINDOWS, FILE_PACKAGER, PIPE, DEBUG
 from tools.utils import delete_dir
 
@@ -4454,14 +4455,18 @@ def test_webgl_simple_extensions(self, webgl_version, simple_enable_extensions):
     self.btest_exit('webgl2_simple_enable_extensions.c', cflags=cmd)
 
   @parameterized({
-    '': ([],),
-    'closure': (['-sASSERTIONS', '--closure=1'],),
-    'closure_advanced': (['-sASSERTIONS', '--closure=1', '-O3'],),
-    'main_module': (['-sMAIN_MODULE=1'],),
-    'pthreads': (['-pthread', '-sOFFSCREENCANVAS_SUPPORT'],),
+    '': (True, [],),
+    'closure': (True, ['-sASSERTIONS', '--closure=1'],),
+    'closure_advanced': (True, ['-sASSERTIONS', '--closure=1', '-O3'],),
+    # Not precached with PIC
+    'main_module': (False, ['-sMAIN_MODULE=1'],),
+    # Not precached with SHARED_MEMORY
+    'pthreads': (False, ['-pthread', '-sOFFSCREENCANVAS_SUPPORT'],),
   })
   @requires_webgpu
-  def test_webgpu_basic_rendering(self, args):
+  def test_webgpu_basic_rendering(self, assume_precached, args):
+    if config.FROZEN_CACHE and not assume_precached:
+      self.skipTest("test doesn't work with frozen cache")
     self.btest_exit('webgpu_basic_rendering.cpp', cflags=['--use-port=emdawnwebgpu', '-sEXIT_RUNTIME'] + args)
 
   @requires_webgpu

test/test_other.py

@@ -2586,6 +2586,7 @@ def test_contrib_ports(self):
 
   @requires_network
   def test_remote_ports(self):
+    self.set_setting('DEFAULT_TO_CXX')  # emdawnwebgpu uses C++ internally
     self.emcc(test_file('hello_world.c'), ['--use-port=emdawnwebgpu'])
 
   @crossplatform
@@ -9650,11 +9651,10 @@ def test_closure_full_js_library(self, args):
     for sym in glsyms:
       self.assertContained('.' + sym, js)
 
-  @crossplatform  # So tests will run on non-Linux platforms, where FROZEN_CACHE isn't set.
   @also_with_wasm64
   def test_closure_webgpu(self):
-    if config.FROZEN_CACHE:
-      # TODO(crbug.com/446944885): Make Emdawnwebgpu work with FROZEN_CACHE if possible.
+    if config.FROZEN_CACHE and self.get_setting('MEMORY64'):
+      # CI configuration doesn't run `embuilder` with wasm64 on ports
       self.skipTest("test doesn't work with frozen cache")
     self.set_setting('DEFAULT_TO_CXX')  # emdawnwebgpu uses C++ internally
     self.build('hello_world.c', cflags=[
@@ -12302,16 +12302,16 @@ def test_standalone_syscalls(self):
       self.assertContained(expected, self.run_js('test.wasm', engine))
 
   @flaky('https://github.com/emscripten-core/emscripten/issues/25343')
-  @crossplatform  # So tests will run on non-Linux platforms, where FROZEN_CACHE isn't set.
+  @crossplatform
   @also_with_wasm64
   @parameterized({
     '': ([],),
     'closure': (['--closure=1', '-Werror=closure'],),
     'closure_assertions': (['--closure=1', '-Werror=closure', '-sASSERTIONS'],),
   })
   def test_emdawnwebgpu_link_test(self, args):
-    if config.FROZEN_CACHE:
-      # TODO(crbug.com/446944885): Make Emdawnwebgpu work with FROZEN_CACHE if possible.
+    if config.FROZEN_CACHE and self.get_setting('MEMORY64'):
+      # CI configuration doesn't run `embuilder` with wasm64 on ports
       self.skipTest("test doesn't work with frozen cache")
     self.emcc(test_file('test_emdawnwebgpu_link_test.cpp'), ['--use-port=emdawnwebgpu', '-sASYNCIFY'] + args)