Skip to content

Fix tests that were broken in STRICT_JS mode. NFC #26422

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
Mar 10, 2026
+39 −42
Merged

Fix tests that were broken in STRICT_JS mode. NFC #26422

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
72 changes: 35 additions & 37 deletions src/lib/libglemu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,43 +34,41 @@ var LibraryGLEmulation = {
'glVertexAttribPointer', 'glActiveTexture', '$stringToNewUTF8',
'$ptrToString', '$getEmscriptenSupportedExtensions',
],
$GLEmulation__postset:
#if MAYBE_CLOSURE_COMPILER
// Forward declare GL functions that are overridden by GLEmulation here to appease Closure compiler.
'/**@suppress {duplicate, undefinedVars}*/var _emscripten_glDrawArrays;' +
'/**@suppress {duplicate, undefinedVars}*/var _emscripten_glDrawElements;' +
'/**@suppress {duplicate, undefinedVars}*/var _emscripten_glActiveTexture;' +
'/**@suppress {duplicate, undefinedVars}*/var _emscripten_glEnable;' +
'/**@suppress {duplicate, undefinedVars}*/var _emscripten_glDisable;' +
'/**@suppress {duplicate, undefinedVars}*/var _emscripten_glTexEnvf;' +
'/**@suppress {duplicate, undefinedVars}*/var _emscripten_glTexEnvi;' +
'/**@suppress {duplicate, undefinedVars}*/var _emscripten_glTexEnvfv;' +
'/**@suppress {duplicate, undefinedVars}*/var _emscripten_glGetIntegerv;' +
'/**@suppress {duplicate, undefinedVars}*/var _emscripten_glIsEnabled;' +
'/**@suppress {duplicate, undefinedVars}*/var _emscripten_glGetBooleanv;' +
'/**@suppress {duplicate, undefinedVars}*/var _emscripten_glGetString;' +
'/**@suppress {duplicate, undefinedVars}*/var _emscripten_glCreateShader;' +
'/**@suppress {duplicate, undefinedVars}*/var _emscripten_glShaderSource;' +
'/**@suppress {duplicate, undefinedVars}*/var _emscripten_glCompileShader;' +
'/**@suppress {duplicate, undefinedVars}*/var _emscripten_glAttachShader;' +
'/**@suppress {duplicate, undefinedVars}*/var _emscripten_glDetachShader;' +
'/**@suppress {duplicate, undefinedVars}*/var _emscripten_glUseProgram;' +
'/**@suppress {duplicate, undefinedVars}*/var _emscripten_glDeleteProgram;' +
'/**@suppress {duplicate, undefinedVars}*/var _emscripten_glBindAttribLocation;' +
'/**@suppress {duplicate, undefinedVars}*/var _emscripten_glLinkProgram;' +
'/**@suppress {duplicate, undefinedVars}*/var _emscripten_glBindBuffer;' +
'/**@suppress {duplicate, undefinedVars}*/var _emscripten_glGetFloatv;' +
'/**@suppress {duplicate, undefinedVars}*/var _emscripten_glHint;' +
'/**@suppress {duplicate, undefinedVars}*/var _emscripten_glEnableVertexAttribArray;' +
'/**@suppress {duplicate, undefinedVars}*/var _emscripten_glDisableVertexAttribArray;' +
'/**@suppress {duplicate, undefinedVars}*/var _emscripten_glVertexAttribPointer;' +
'/**@suppress {duplicate, undefinedVars}*/var _glTexEnvf;' +
'/**@suppress {duplicate, undefinedVars}*/var _glTexEnvi;' +
'/**@suppress {duplicate, undefinedVars}*/var _glTexEnvfv;' +
'/**@suppress {duplicate, undefinedVars}*/var _glGetTexEnviv;' +
'/**@suppress {duplicate, undefinedVars}*/var _glGetTexEnvfv;' +
#endif
'GLEmulation.init();',
$GLEmulation__postset: `
// Forward declare GL functions that are overridden by GLEmulation.
/**@suppress {duplicate, undefinedVars}*/var _emscripten_glDrawArrays;
/**@suppress {duplicate, undefinedVars}*/var _emscripten_glDrawElements;
/**@suppress {duplicate, undefinedVars}*/var _emscripten_glActiveTexture;
/**@suppress {duplicate, undefinedVars}*/var _emscripten_glEnable;
/**@suppress {duplicate, undefinedVars}*/var _emscripten_glDisable;
/**@suppress {duplicate, undefinedVars}*/var _emscripten_glTexEnvf;
/**@suppress {duplicate, undefinedVars}*/var _emscripten_glTexEnvi;
/**@suppress {duplicate, undefinedVars}*/var _emscripten_glTexEnvfv;
/**@suppress {duplicate, undefinedVars}*/var _emscripten_glGetIntegerv;
/**@suppress {duplicate, undefinedVars}*/var _emscripten_glIsEnabled;
/**@suppress {duplicate, undefinedVars}*/var _emscripten_glGetBooleanv;
/**@suppress {duplicate, undefinedVars}*/var _emscripten_glGetString;
/**@suppress {duplicate, undefinedVars}*/var _emscripten_glCreateShader;
/**@suppress {duplicate, undefinedVars}*/var _emscripten_glShaderSource;
/**@suppress {duplicate, undefinedVars}*/var _emscripten_glCompileShader;
/**@suppress {duplicate, undefinedVars}*/var _emscripten_glAttachShader;
/**@suppress {duplicate, undefinedVars}*/var _emscripten_glDetachShader;
/**@suppress {duplicate, undefinedVars}*/var _emscripten_glUseProgram;
/**@suppress {duplicate, undefinedVars}*/var _emscripten_glDeleteProgram;
/**@suppress {duplicate, undefinedVars}*/var _emscripten_glBindAttribLocation;
/**@suppress {duplicate, undefinedVars}*/var _emscripten_glLinkProgram;
/**@suppress {duplicate, undefinedVars}*/var _emscripten_glBindBuffer;
/**@suppress {duplicate, undefinedVars}*/var _emscripten_glGetFloatv;
/**@suppress {duplicate, undefinedVars}*/var _emscripten_glHint;
/**@suppress {duplicate, undefinedVars}*/var _emscripten_glEnableVertexAttribArray;
/**@suppress {duplicate, undefinedVars}*/var _emscripten_glDisableVertexAttribArray;
/**@suppress {duplicate, undefinedVars}*/var _emscripten_glVertexAttribPointer;
/**@suppress {duplicate, undefinedVars}*/var _glTexEnvf;
/**@suppress {duplicate, undefinedVars}*/var _glTexEnvi;
/**@suppress {duplicate, undefinedVars}*/var _glTexEnvfv;
/**@suppress {duplicate, undefinedVars}*/var _glGetTexEnviv;
/**@suppress {duplicate, undefinedVars}*/var _glGetTexEnvfv;
GLEmulation.init();`,
$GLEmulation: {
// Fog support. Partial, we assume shaders are used that implement fog. We just pass them uniforms
fogStart: 0,
Expand Down
1 change: 0 additions & 1 deletion test/browser/glut_touchevents.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ int main(int argc, char *argv[])
touches.item = function(i) { return this[i]; };

var event = document.createEvent('UIEvent');
event.target = Module['canvas'];
Copy link
Collaborator Author

@sbc100 sbc100 Mar 9, 2026

Choose a reason for hiding this comment

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

The dispatchEvent call below takes care of setting the target.

event.button = 0;
event.changedTouches = touches;
event.initUIEvent(eventType, true, true, window, 1);
Expand Down
2 changes: 1 addition & 1 deletion test/embind/test_pthreads.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ using namespace emscripten;

void thread(void) {
EM_ASM({
globalProperty = {
globalThis.globalProperty = {
foo: function(value) {
return value;
}
Expand Down
2 changes: 1 addition & 1 deletion test/other/test_runtime_keepalive.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ int main() {
Module["onExit"] = () => { out("onExit"); };
runtimeKeepalivePush();
out("runtimeKeepalivePush done");
counter = 0;
var counter = 0;
function timerCallback() {
if (counter < 5) {
runtimeKeepalivePush();
Expand Down
4 changes: 2 additions & 2 deletions test/test_browser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -944,7 +944,7 @@ def test_sdl_stb_image_cleanup(self):
'safe_heap_O2': (['-sSAFE_HEAP', '-O2'],),
})
def test_sdl_canvas(self, args):
self.btest_exit('test_sdl_canvas.c', cflags=['-sLEGACY_GL_EMULATION', '-lSDL', '-lGL'] + args)
self.btest_exit('test_sdl_canvas.c', cflags=['-sSTRICT_JS', '-sLEGACY_GL_EMULATION', '-lSDL', '-lGL'] + args)

def test_sdl_canvas_alpha(self):
# N.B. On Linux with Intel integrated graphics cards, this test needs Firefox 49 or newer.
Expand Down Expand Up @@ -1058,7 +1058,7 @@ def test_sdl_mouse_offsets(self):
self.run_browser('page.html', '', '/report_result?exit:0')

def test_glut_touchevents(self):
self.btest_exit('glut_touchevents.c', cflags=['-lglut'])
self.btest_exit('glut_touchevents.c', cflags=['-lglut', '-sSTRICT_JS'])

def test_glut_wheelevents(self):
self.btest_exit('glut_wheelevents.c', cflags=['-lglut'])
Expand Down