Skip to content
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions tests/test_other.py
Original file line number Diff line number Diff line change
Expand Up @@ -2274,9 +2274,9 @@ def test_conftest_s_flag_passing(self):
return 0;
}
''')
cmd = [EMCC, '-s', 'ASSERTIONS', 'conftest.c', '-o', 'conftest']
with env_modify({'EMMAKEN_JUST_CONFIGURE': '1'}):
cmd = [EMCC, '-s', 'ASSERTIONS', 'conftest.c', '-o', 'conftest']
output = self.run_process(cmd, stderr=PIPE)
output = self.run_process(cmd, stderr=PIPE)

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess that env_modify is not needed here since the filename (conftest.c) is enough of signal to run in this mode? Maybe just remove the with and replac with a comment?

self.assertNotContained('emcc: warning: treating -s as linker option', output.stderr)
self.assertExists('conftest')

Expand Down Expand Up @@ -10256,3 +10256,9 @@ def test_output_name_collision(self):
self.assertExists('hello.wasm')
self.assertExists('hello_.wasm')
self.assertContained('hello, world!', self.run_js('hello.wasm'))

def test_EM_PYTHON_MULTIPROCESSING(self):

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If this really is just a temporary thing perhaps mention in changelog why it was added and that is just a transitional thing to help people temporarily revert?

with env_modify({'EM_PYTHON_MULTIPROCESSING': '1'}):
# wasm2js optimizations use multiprocessing to run multiple node
# invocations
self.run_process([EMCC, test_file('hello_world.c'), '-sWASM=0', '-O2'])