Add Safari version parsing to gate hacks to older versions

Author: juj

test/common.py

@@ -18,6 +18,7 @@
 import json
 import logging
 import os
+import plistlib
 import psutil
 import re
 import shlex
@@ -215,6 +216,17 @@ def is_safari():
   return EMTEST_BROWSER and 'safari' in EMTEST_BROWSER.lower()
 
 
+def get_safari_version():
+  plist_path = os.path.join(EMTEST_BROWSER.strip(), 'Contents', 'version.plist')
+  version_str = plistlib.load(open(plist_path, 'rb')).get('CFBundleShortVersionString')
+  # Split into parts (major.minor.patch)
+  parts = (version_str.split('.') + ['0', '0', '0'])[:3]
+  # Convert each part into integers, discarding any trailing string, e.g. '13a' -> 13.
+  parts = [int(re.match(r"\d+", s).group()) if re.match(r"\d+", s) else 0 for s in parts]
+  # Return version as XXYYZZ
+  return parts[0] * 10000 + parts[1] * 100 + parts[2]
+
+
 def compiler_for(filename, force_c=False):
   if shared.suffix(filename) in ('.cc', '.cxx', '.cpp') and not force_c:
     return EMXX
@@ -2724,6 +2736,13 @@ def run_browser(self, html_file, expected=None, message=None, timeout=None, extr
     if DEBUG:
       print('[browser launch:', html_file, ']')
     assert not (message and expected), 'run_browser expects `expected` or `message`, but not both'
+
+    # Needed at least for version Safari Version 17.6 (17618.3.11.11.7, 17618)
+    if is_safari() and get_safari_version() < 180000: # TODO: Find accurate version cutoff
+      # Old Safari cannot handle running multiple browser pages in the same browser instance
+      # So restart the browser between each browser test.
+      self.browser_restart()
+
     if expected is not None:
       try:
         self.harness_in_queue.put((

test/test_browser.py

@@ -142,6 +142,8 @@ def is_swiftshader(_):
 
 no_firefox = skip_if('no_firefox', lambda _: is_firefox(), 'firefox is not supported')
 
+no_safari = skip_if('no_safari', lambda _: is_safari(), 'safari is not supported')
+
 
 def is_jspi(args):
   return '-sASYNCIFY=2' in args
@@ -3356,6 +3358,7 @@ def test_async_returnvalue(self, args):
       create_file('filey.txt', 'sync_tunnel\nsync_tunnel_bool\n')
     self.btest('test_async_returnvalue.c', '0', cflags=['-sASSERTIONS', '-sASYNCIFY', '-sASYNCIFY_IGNORE_INDIRECT', '--js-library', test_file('browser/test_async_returnvalue.js')] + args)
 
+  @no_safari('TODO: Fails in Safari Version 17.6 (17618.3.11.11.7, 17618)')
   def test_async_bad_list(self):
     self.btest('test_async_bad_list.c', '0', cflags=['-sASYNCIFY', '-sASYNCIFY_ONLY=waka', '--profiling'])