Skip to content

Commit cbccde9

Browse files
committed
[test] Remove zzz prefix from high memory browser tests
Also remove `require_wasm64` hack which should no longer be needed now that we run node 16 by default.
1 parent 8a7ed56 commit cbccde9

File tree

1 file changed

+6
-12
lines changed

1 file changed

+6
-12
lines changed

test/test_browser.py

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -234,10 +234,6 @@ def setUp(self):
234234
'-Wno-int-conversion',
235235
]
236236

237-
def require_wasm64(self):
238-
# All the browsers we run on support wasm64 (Chrome and Firefox).
239-
return True
240-
241237
def require_wasm2js(self):
242238
if self.is_wasm64():
243239
self.skipTest('wasm2js is not compatible with MEMORY64')
@@ -1691,9 +1687,7 @@ def test_worker(self):
16911687
self.run_browser('main.html', '/report_result?hello from worker, and :' + ('data for w' if file_data else '') + ':')
16921688

16931689
# code should run standalone too
1694-
# (doesn't work under browser64 due to `require_wasm64` hack in this class)
1695-
if not self.is_wasm64():
1696-
self.assertContained('you should not see this text when in a worker!', self.run_js('worker.js'))
1690+
self.assertContained('you should not see this text when in a worker!', self.run_js('worker.js'))
16971691

16981692
@no_wasmfs('https://github.com/emscripten-core/emscripten/issues/19608')
16991693
def test_mmap_lazyfile(self):
@@ -5562,7 +5556,7 @@ def test_wasm_worker_proxied_function(self):
55625556

55635557
@no_firefox('no 4GB support yet')
55645558
@requires_v8
5565-
def test_zzz_zzz_4gb(self):
5559+
def test_4gb(self):
55665560
# TODO Convert to an actual browser test when it reaches stable.
55675561
# For now, keep this in browser as this suite runs serially, which
55685562
# means we don't compete for memory with anything else (and run it
@@ -5576,7 +5570,7 @@ def test_zzz_zzz_4gb(self):
55765570

55775571
# Tests that emmalloc supports up to 4GB Wasm heaps.
55785572
@no_firefox('no 4GB support yet')
5579-
def test_zzz_zzz_emmalloc_4gb(self):
5573+
def test_emmalloc_4gb(self):
55805574
# For now, keep this in browser as this suite runs serially, which
55815575
# means we don't compete for memory with anything else (and run it
55825576
# at the very very end, to reduce the risk of it OOM-killing the
@@ -5653,12 +5647,12 @@ def test_wasmfs_opfs_errors(self):
56535647
self.btest(test, args=args, expected="0")
56545648

56555649
@no_firefox('no 4GB support yet')
5656-
def test_zzz_zzz_emmalloc_memgrowth(self, *args):
5650+
def test_emmalloc_memgrowth(self, *args):
56575651
self.btest('emmalloc_memgrowth.cpp', expected='0', args=['-sMALLOC=emmalloc', '-sALLOW_MEMORY_GROWTH=1', '-sABORTING_MALLOC=0', '-sASSERTIONS=2', '-sMINIMAL_RUNTIME=1', '-sMAXIMUM_MEMORY=4GB'])
56585652

56595653
@no_firefox('no 4GB support yet')
56605654
@requires_v8
5661-
def test_zzz_zzz_2gb_fail(self):
5655+
def test_2gb_fail(self):
56625656
# TODO Convert to an actual browser test when it reaches stable.
56635657
# For now, keep this in browser as this suite runs serially, which
56645658
# means we don't compete for memory with anything else (and run it
@@ -5673,7 +5667,7 @@ def test_zzz_zzz_2gb_fail(self):
56735667
@no_firefox('no 4GB support yet')
56745668
@requires_v8
56755669
@no_wasm64()
5676-
def test_zzz_zzz_4gb_fail(self):
5670+
def test_4gb_fail(self):
56775671
# TODO Convert to an actual browser test when it reaches stable.
56785672
# For now, keep this in browser as this suite runs serially, which
56795673
# means we don't compete for memory with anything else (and run it

0 commit comments

Comments
 (0)