Skip to content

Commit 3a96246

Browse files
authored
Mark test_rollup as @Crossplatform. NFC (emscripten-core#23735)
1 parent cb8d502 commit 3a96246

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

test/common.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1412,6 +1412,10 @@ def build(self, filename, libraries=None, includes=None, force_c=False, emcc_arg
14121412
self.run_process(cmd, stderr=self.stderr_redirect if not DEBUG else None)
14131413
self.assertExists(output)
14141414

1415+
if output_suffix in ('.js', '.mjs'):
1416+
# Make sure we produced correct line endings
1417+
self.assertEqual(line_endings.check_line_endings(output), 0)
1418+
14151419
return output
14161420

14171421
def get_func(self, src, name):
@@ -1528,10 +1532,6 @@ def run_js(self, filename, engine=None, args=None,
15281532
if stderr != STDOUT:
15291533
stderr.close()
15301534

1531-
# Make sure that we produced proper line endings to the .js file we are about to run.
1532-
if not filename.endswith('.wasm'):
1533-
self.assertEqual(line_endings.check_line_endings(filename), 0)
1534-
15351535
ret = read_file(stdout_file)
15361536
if not interleaved_output:
15371537
ret += read_file(stderr_file)

test/test_other.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15678,6 +15678,7 @@ def test_late_module_api_assignment(self):
1567815678
expected = f"Aborted(Attempt to set `Module.{prop}` after it has already been processed. This can happen, for example, when code is injected via '--post-js' rather than '--pre-js')"
1567915679
self.do_runf(test_file('hello_world.c'), expected, emcc_args=['--post-js=post.js', '-sWASM_ASYNC_COMPILATION=0'], assert_returncode=NON_ZERO)
1568015680

15681+
@crossplatform
1568115682
def test_rollup(self):
1568215683
copytree(test_file('rollup_node'), '.')
1568315684
self.run_process([EMCC, test_file('hello_world.c'), '-sEXPORT_ES6', '-sEXIT_RUNTIME', '-sENVIRONMENT=node', '-sMODULARIZE', '-o', 'hello.mjs'])

0 commit comments

Comments
 (0)