Skip to content
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.

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

[wasm64] Fix a lot of the remaining browser tests #20516

Merged
merged 1 commit into from
Nov 8, 2023

Conversation

sbc100
Copy link
Collaborator

@sbc100 sbc100 commented Oct 23, 2023

This also inverts the testing logic such that we run all browser tests in wasm64 mode. Tests that don't currently pass are annotated with @no_wasm64.

@sbc100 sbc100 marked this pull request as draft October 23, 2023 17:16
@sbc100 sbc100 force-pushed the browser_wasm64_part2 branch 14 times, most recently from 6b89ae4 to f74fc7e Compare October 24, 2023 16:57
sbc100 added a commit to sbc100/emscripten that referenced this pull request Oct 26, 2023
sbc100 added a commit to sbc100/emscripten that referenced this pull request Oct 26, 2023
sbc100 added a commit that referenced this pull request Oct 26, 2023
sbc100 added a commit to sbc100/emscripten that referenced this pull request Oct 27, 2023
sbc100 added a commit to sbc100/emscripten that referenced this pull request Oct 27, 2023
sbc100 added a commit that referenced this pull request Oct 27, 2023
@sbc100 sbc100 force-pushed the browser_wasm64_part2 branch from f74fc7e to 53205a1 Compare October 27, 2023 18:10
sbc100 added a commit to sbc100/emscripten that referenced this pull request Nov 1, 2023
sbc100 added a commit that referenced this pull request Nov 1, 2023
sbc100 added a commit to sbc100/emscripten that referenced this pull request Nov 1, 2023
sbc100 added a commit that referenced this pull request Nov 4, 2023
@sbc100 sbc100 force-pushed the browser_wasm64_part2 branch from 53205a1 to 765d988 Compare November 6, 2023 04:41
sbc100 added a commit to sbc100/emscripten that referenced this pull request Nov 6, 2023
sbc100 added a commit to sbc100/emscripten that referenced this pull request Nov 7, 2023
sbc100 added a commit to sbc100/emscripten that referenced this pull request Nov 7, 2023
As part of this EGLNativeDisplayType was fixed to match X11

This allows `Display*` (a pointer type) to be passed into our
eglGetDisplay function without a cast warning on wasm64 (where pointers
and int have a different width).

Split out from emscripten-core#20516
sbc100 added a commit to sbc100/emscripten that referenced this pull request Nov 7, 2023
As part of this EGLNativeDisplayType was fixed to match X11

This allows `Display*` (a pointer type) to be passed into our
eglGetDisplay function without a cast warning on wasm64 (where pointers
and int have a different width).

Split out from emscripten-core#20516
sbc100 added a commit to sbc100/emscripten that referenced this pull request Nov 7, 2023
As part of this EGLNativeDisplayType was fixed to match X11

This allows `Display*` (a pointer type) to be passed into our
eglGetDisplay function without a cast warning on wasm64 (where pointers
and int have a different width).

Split out from emscripten-core#20516
sbc100 added a commit that referenced this pull request Nov 7, 2023
As part of this EGLNativeDisplayType was fixed to match X11

This allows `Display*` (a pointer type) to be passed into our
eglGetDisplay function without a cast warning on wasm64 (where pointers
and int have a different width).

Split out from #20516
@sbc100 sbc100 force-pushed the browser_wasm64_part2 branch 3 times, most recently from b413cce to e2304e4 Compare November 8, 2023 17:16
@sbc100 sbc100 requested review from kripken and dschuff November 8, 2023 17:16
@sbc100 sbc100 marked this pull request as ready for review November 8, 2023 17:16
@sbc100 sbc100 force-pushed the browser_wasm64_part2 branch 3 times, most recently from c1a9b5d to 7e39e71 Compare November 8, 2023 19:25
@sbc100
Copy link
Collaborator Author

sbc100 commented Nov 8, 2023

I think this change is now small enough to land, having split ~10 changes from it.

PTAL.

@sbc100 sbc100 force-pushed the browser_wasm64_part2 branch from 7e39e71 to 66691bd Compare November 8, 2023 20:03
test/test_mem_growth.c Outdated Show resolved Hide resolved
test/wasmfs/wasmfs_fetch.js Outdated Show resolved Hide resolved
Copy link
Member

@kripken kripken left a comment

Choose a reason for hiding this comment

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

lgtm % comments

test/test_browser.py Outdated Show resolved Hide resolved
test/test_browser.py Outdated Show resolved Hide resolved
test/test_browser.py Outdated Show resolved Hide resolved
test/test_browser.py Outdated Show resolved Hide resolved
This also inverts the testing logic such that we run all browser
tests in wasm64 mode.  Tests that don't currently pass are annotated
with @no_wasm64.
@sbc100 sbc100 force-pushed the browser_wasm64_part2 branch from 66691bd to 3995ce4 Compare November 8, 2023 21:22
test/test_mem_growth.c Show resolved Hide resolved
@sbc100 sbc100 merged commit e837112 into emscripten-core:main Nov 8, 2023
@sbc100 sbc100 deleted the browser_wasm64_part2 branch November 8, 2023 23:09
sbc100 added a commit that referenced this pull request Nov 8, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants