Skip to content

Cleanup test_wasm_worker_terminate. NFC #22762

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sbc100 merged 1 commit into from
Oct 17, 2024
Merged

Cleanup test_wasm_worker_terminate. NFC #22762

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 1 addition & 4 deletions test/test_browser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5059,10 +5059,7 @@ def test_wasm_worker_sleep(self):
# Tests emscripten_terminate_wasm_worker()
@also_with_minimal_runtime
def test_wasm_worker_terminate(self):
self.set_setting('WASM_WORKERS')
# Test uses the dynCall library function in its EM_ASM code
self.set_setting('DEFAULT_LIBRARY_FUNCS_TO_INCLUDE', ['$dynCall'])
self.btest('wasm_worker/terminate_wasm_worker.c', expected='0')
self.btest('wasm_worker/terminate_wasm_worker.c', expected='0', args=['-sWASM_WORKERS'])

# Tests emscripten_terminate_all_wasm_workers()
@also_with_minimal_runtime
Expand Down
3 changes: 3 additions & 0 deletions test/wasm_worker/terminate_wasm_worker.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#include <emscripten/console.h>
#include <emscripten/em_asm.h>
#include <emscripten/em_js.h>
#include <emscripten/eventloop.h>
#include <emscripten/wasm_worker.h>
#include <assert.h>
Expand Down Expand Up @@ -36,6 +37,8 @@ void worker_main() {

char stack[1024];

EM_JS_DEPS(deps, "$dynCall");

int should_throw(void(*func)()) {
int threw = EM_ASM_INT({
try {
Expand Down
Loading