Skip to content

Commit

Permalink
[test] Remove zzz prefix from high memory browser tests
Browse files Browse the repository at this point in the history
Also remove `require_wasm64` hack which should no longer be needed
now that we run node 16 by default.
  • Loading branch information
sbc100 committed Nov 21, 2023
1 parent 8a7ed56 commit cbccde9
Showing 1 changed file with 6 additions and 12 deletions.
18 changes: 6 additions & 12 deletions test/test_browser.py
Original file line number Diff line number Diff line change
Expand Up @@ -234,10 +234,6 @@ def setUp(self):
'-Wno-int-conversion',
]

def require_wasm64(self):
# All the browsers we run on support wasm64 (Chrome and Firefox).
return True

def require_wasm2js(self):
if self.is_wasm64():
self.skipTest('wasm2js is not compatible with MEMORY64')
Expand Down Expand Up @@ -1691,9 +1687,7 @@ def test_worker(self):
self.run_browser('main.html', '/report_result?hello from worker, and :' + ('data for w' if file_data else '') + ':')

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

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

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

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

@no_firefox('no 4GB support yet')
def test_zzz_zzz_emmalloc_memgrowth(self, *args):
def test_emmalloc_memgrowth(self, *args):
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'])

@no_firefox('no 4GB support yet')
@requires_v8
def test_zzz_zzz_2gb_fail(self):
def test_2gb_fail(self):
# TODO Convert to an actual browser test when it reaches stable.
# For now, keep this in browser as this suite runs serially, which
# means we don't compete for memory with anything else (and run it
Expand All @@ -5673,7 +5667,7 @@ def test_zzz_zzz_2gb_fail(self):
@no_firefox('no 4GB support yet')
@requires_v8
@no_wasm64()
def test_zzz_zzz_4gb_fail(self):
def test_4gb_fail(self):
# TODO Convert to an actual browser test when it reaches stable.
# For now, keep this in browser as this suite runs serially, which
# means we don't compete for memory with anything else (and run it
Expand Down

0 comments on commit cbccde9

Please sign in to comment.