From a23fdef492f7de96ca1784e79c883af25a64062a Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Fri, 26 Jan 2024 22:24:49 +0000
Subject: [PATCH] [ci] Split browser64_4gb into its own runner (#21182)

Also add test_TextDecoder to the list of test.
---
 .circleci/config.yml | 18 ++++++++++++------
 test/test_browser.py |  1 -
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8be877095c29..cd1428b86aeb 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -653,7 +653,7 @@ jobs:
             other.test_memory64_proxies
             other.test_failing_growth_wasm64"
       - upload-test-results
-  test-wasm64_4gb:
+  test-wasm64-4gb:
     environment:
       LANG: "C.UTF-8"
       # Only run 2 tests at a time to avoid OOM (since each tests used >4gb)
@@ -805,11 +805,14 @@ jobs:
     steps:
       - run-tests-chrome:
           title: "browser64"
-          # skip test_4gb_fail as it OOMs on the current bot
-          # Run a few tests in browser64_4gb mode too.
+          test_targets: "browser64"
+  test-browser-chrome-wasm64-4gb:
+    executor: bionic
+    steps:
+      - run-tests-chrome:
+          title: "browser64_4gb"
           test_targets: "
-            browser64
-            skip:browser64.test_4gb_fail
+            browser64_4gb.test_TextDecoder*
             browser64_4gb.test_async_*
             browser64_4gb.test_audio_worklet*
             browser64_4gb.test_emscripten_log
@@ -953,7 +956,7 @@ workflows:
       - test-wasm64:
           requires:
             - build-linux
-      - test-wasm64_4gb:
+      - test-wasm64-4gb:
           requires:
             - build-linux
       - test-wasm64l:
@@ -971,6 +974,9 @@ workflows:
       - test-browser-chrome-wasm64:
           requires:
             - build-linux
+      - test-browser-chrome-wasm64-4gb:
+          requires:
+            - build-linux
       - test-browser-firefox:
           requires:
             - build-linux
diff --git a/test/test_browser.py b/test/test_browser.py
index e1724c4775ee..b38a3a85385c 100644
--- a/test/test_browser.py
+++ b/test/test_browser.py
@@ -4555,7 +4555,6 @@ def test_utf8_textdecoder(self):
   def test_utf16_textdecoder(self):
     self.btest_exit('benchmark/benchmark_utf16.cpp', 0, args=['--embed-file', test_file('utf16_corpus.txt') + '@/utf16_corpus.txt', '-sEXPORTED_RUNTIME_METHODS=[UTF16ToString,stringToUTF16,lengthBytesUTF16]'])
 
-  @no_wasm64()
   @parameterized({
     '': ([],),
     'closure': (['--closure=1'],),