Skip to content

Commit d8c1a8a

Browse files
authored
Support multiple arguments to err/out under node + pthreads (emscripten-core#19228)
1 parent b2c4974 commit d8c1a8a

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

src/shell.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -446,8 +446,8 @@ if (ENVIRONMENT_IS_NODE) {
446446
var defaultPrint = console.log.bind(console);
447447
var defaultPrintErr = console.warn.bind(console);
448448
if (ENVIRONMENT_IS_NODE) {
449-
defaultPrint = (str) => fs.writeSync(1, str + '\n');
450-
defaultPrintErr = (str) => fs.writeSync(2, str + '\n');
449+
defaultPrint = (...args) => fs.writeSync(1, args.join(' ') + '\n');
450+
defaultPrintErr = (...args) => fs.writeSync(2, args.join(' ') + '\n');
451451
}
452452
{{{ makeModuleReceiveWithVar('out', 'print', 'defaultPrint', true) }}}
453453
{{{ makeModuleReceiveWithVar('err', 'printErr', 'defaultPrintErr', true) }}}

test/test_other.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13372,3 +13372,8 @@ def run(args, expect_bulk_mem):
1337213372
def test_memory_init_file_unsupported(self):
1337313373
err = self.expect_fail([EMCC, test_file('hello_world.c'), '-Werror', '--memory-init-file=1'])
1337413374
self.assertContained('error: --memory-init-file is only supported with -sWASM=0 [-Wunsupported] [-Werror]', err)
13375+
13376+
@node_pthreads
13377+
def test_node_pthreads_err_out(self):
13378+
create_file('post.js', 'err(1, 2, "hello"); out("foo", 42);')
13379+
self.do_runf(test_file('hello_world.c'), '1 2 hello\nfoo 42\n', emcc_args=['--post-js=post.js'])

0 commit comments

Comments
 (0)