Skip to content

[testing] Use different ports for parameterized test_cross_origin. #25832

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
merged 1 commit into from
Nov 20, 2025
Merged

[testing] Use different ports for parameterized test_cross_origin. #25832

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
18 changes: 10 additions & 8 deletions test/test_browser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5664,15 +5664,17 @@ def test_rollup(self):
shutil.copy('hello.wasm', 'dist/')
self.run_browser('index.html', '/report_result?exit:0')

# Use different ports for each parameterized version so they can be run in
# parallel and not conflict.
@parameterized({
'': ([],),
'es6': (['-sEXPORT_ES6', '--extern-post-js', test_file('modularize_post_js.js')],),
'': ([], 9998),
'es6': (['-sEXPORT_ES6', '--extern-post-js', test_file('modularize_post_js.js')], 9999),
})
def test_cross_origin(self, args):
def test_cross_origin(self, args, port):
# Verfies that the emscripten-generted JS and Wasm can be hosted on a different origin.
# This test create a second HTTP server running on port 9999 that servers files from `subdir`.
# This test create a second HTTP server running a different port that servers files from `subdir`.
# The main html is the servers from the normal 8888 server while the JS and Wasm are hosted
# on at 9999.
# on the port specified above.
os.mkdir('subdir')
create_file('subdir/foo.txt', 'hello')
self.compile_btest('hello_world.c', ['-o', 'subdir/hello.js', '-sRUNTIME_DEBUG', '-sCROSS_ORIGIN', '-sPROXY_TO_PTHREAD', '-pthread', '-sEXIT_RUNTIME'] + args)
Expand All @@ -5697,11 +5699,11 @@ def end_headers(self):
return SimpleHTTPRequestHandler.end_headers(self)

if '-sEXPORT_ES6' in args:
create_file('test.html', '<script src="http://localhost:9999/hello.js" type="module"></script>')
create_file('test.html', f'<script src="http://localhost:{port}/hello.js" type="module"></script>')
else:
create_file('test.html', '<script src="http://localhost:9999/hello.js"></script>')
create_file('test.html', f'<script src="http://localhost:{port}/hello.js"></script>')

server = HttpServerThread(ThreadingHTTPServer(('localhost', 9999), MyReqestHandler))
server = HttpServerThread(ThreadingHTTPServer(('localhost', port), MyReqestHandler))
server.start()
try:
self.run_browser('test.html', '/report_result?exit:0')
Expand Down