Skip to content

Commit a699999

Browse files
sbc100sbc100
authored
Fix tests that were broken in STRICT_JS mode. NFC (#26422)
Split out from #26421
1 parent 7d909ca commit a699999

5 files changed

Lines changed: 39 additions & 42 deletions

File tree

‎src/lib/libglemu.js‎

Lines changed: 35 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -34,43 +34,41 @@ var LibraryGLEmulation = {
3434
'glVertexAttribPointer', 'glActiveTexture', '$stringToNewUTF8',
3535
'$ptrToString', '$getEmscriptenSupportedExtensions',
3636
],
37-
$GLEmulation__postset:
38-
#if MAYBE_CLOSURE_COMPILER
39-
// Forward declare GL functions that are overridden by GLEmulation here to appease Closure compiler.
40-
'/**@suppress {duplicate, undefinedVars}*/var _emscripten_glDrawArrays;' +
41-
'/**@suppress {duplicate, undefinedVars}*/var _emscripten_glDrawElements;' +
42-
'/**@suppress {duplicate, undefinedVars}*/var _emscripten_glActiveTexture;' +
43-
'/**@suppress {duplicate, undefinedVars}*/var _emscripten_glEnable;' +
44-
'/**@suppress {duplicate, undefinedVars}*/var _emscripten_glDisable;' +
45-
'/**@suppress {duplicate, undefinedVars}*/var _emscripten_glTexEnvf;' +
46-
'/**@suppress {duplicate, undefinedVars}*/var _emscripten_glTexEnvi;' +
47-
'/**@suppress {duplicate, undefinedVars}*/var _emscripten_glTexEnvfv;' +
48-
'/**@suppress {duplicate, undefinedVars}*/var _emscripten_glGetIntegerv;' +
49-
'/**@suppress {duplicate, undefinedVars}*/var _emscripten_glIsEnabled;' +
50-
'/**@suppress {duplicate, undefinedVars}*/var _emscripten_glGetBooleanv;' +
51-
'/**@suppress {duplicate, undefinedVars}*/var _emscripten_glGetString;' +
52-
'/**@suppress {duplicate, undefinedVars}*/var _emscripten_glCreateShader;' +
53-
'/**@suppress {duplicate, undefinedVars}*/var _emscripten_glShaderSource;' +
54-
'/**@suppress {duplicate, undefinedVars}*/var _emscripten_glCompileShader;' +
55-
'/**@suppress {duplicate, undefinedVars}*/var _emscripten_glAttachShader;' +
56-
'/**@suppress {duplicate, undefinedVars}*/var _emscripten_glDetachShader;' +
57-
'/**@suppress {duplicate, undefinedVars}*/var _emscripten_glUseProgram;' +
58-
'/**@suppress {duplicate, undefinedVars}*/var _emscripten_glDeleteProgram;' +
59-
'/**@suppress {duplicate, undefinedVars}*/var _emscripten_glBindAttribLocation;' +
60-
'/**@suppress {duplicate, undefinedVars}*/var _emscripten_glLinkProgram;' +
61-
'/**@suppress {duplicate, undefinedVars}*/var _emscripten_glBindBuffer;' +
62-
'/**@suppress {duplicate, undefinedVars}*/var _emscripten_glGetFloatv;' +
63-
'/**@suppress {duplicate, undefinedVars}*/var _emscripten_glHint;' +
64-
'/**@suppress {duplicate, undefinedVars}*/var _emscripten_glEnableVertexAttribArray;' +
65-
'/**@suppress {duplicate, undefinedVars}*/var _emscripten_glDisableVertexAttribArray;' +
66-
'/**@suppress {duplicate, undefinedVars}*/var _emscripten_glVertexAttribPointer;' +
67-
'/**@suppress {duplicate, undefinedVars}*/var _glTexEnvf;' +
68-
'/**@suppress {duplicate, undefinedVars}*/var _glTexEnvi;' +
69-
'/**@suppress {duplicate, undefinedVars}*/var _glTexEnvfv;' +
70-
'/**@suppress {duplicate, undefinedVars}*/var _glGetTexEnviv;' +
71-
'/**@suppress {duplicate, undefinedVars}*/var _glGetTexEnvfv;' +
72-
#endif
73-
'GLEmulation.init();',
37+
$GLEmulation__postset: `
38+
// Forward declare GL functions that are overridden by GLEmulation.
39+
/**@suppress {duplicate, undefinedVars}*/var _emscripten_glDrawArrays;
40+
/**@suppress {duplicate, undefinedVars}*/var _emscripten_glDrawElements;
41+
/**@suppress {duplicate, undefinedVars}*/var _emscripten_glActiveTexture;
42+
/**@suppress {duplicate, undefinedVars}*/var _emscripten_glEnable;
43+
/**@suppress {duplicate, undefinedVars}*/var _emscripten_glDisable;
44+
/**@suppress {duplicate, undefinedVars}*/var _emscripten_glTexEnvf;
45+
/**@suppress {duplicate, undefinedVars}*/var _emscripten_glTexEnvi;
46+
/**@suppress {duplicate, undefinedVars}*/var _emscripten_glTexEnvfv;
47+
/**@suppress {duplicate, undefinedVars}*/var _emscripten_glGetIntegerv;
48+
/**@suppress {duplicate, undefinedVars}*/var _emscripten_glIsEnabled;
49+
/**@suppress {duplicate, undefinedVars}*/var _emscripten_glGetBooleanv;
50+
/**@suppress {duplicate, undefinedVars}*/var _emscripten_glGetString;
51+
/**@suppress {duplicate, undefinedVars}*/var _emscripten_glCreateShader;
52+
/**@suppress {duplicate, undefinedVars}*/var _emscripten_glShaderSource;
53+
/**@suppress {duplicate, undefinedVars}*/var _emscripten_glCompileShader;
54+
/**@suppress {duplicate, undefinedVars}*/var _emscripten_glAttachShader;
55+
/**@suppress {duplicate, undefinedVars}*/var _emscripten_glDetachShader;
56+
/**@suppress {duplicate, undefinedVars}*/var _emscripten_glUseProgram;
57+
/**@suppress {duplicate, undefinedVars}*/var _emscripten_glDeleteProgram;
58+
/**@suppress {duplicate, undefinedVars}*/var _emscripten_glBindAttribLocation;
59+
/**@suppress {duplicate, undefinedVars}*/var _emscripten_glLinkProgram;
60+
/**@suppress {duplicate, undefinedVars}*/var _emscripten_glBindBuffer;
61+
/**@suppress {duplicate, undefinedVars}*/var _emscripten_glGetFloatv;
62+
/**@suppress {duplicate, undefinedVars}*/var _emscripten_glHint;
63+
/**@suppress {duplicate, undefinedVars}*/var _emscripten_glEnableVertexAttribArray;
64+
/**@suppress {duplicate, undefinedVars}*/var _emscripten_glDisableVertexAttribArray;
65+
/**@suppress {duplicate, undefinedVars}*/var _emscripten_glVertexAttribPointer;
66+
/**@suppress {duplicate, undefinedVars}*/var _glTexEnvf;
67+
/**@suppress {duplicate, undefinedVars}*/var _glTexEnvi;
68+
/**@suppress {duplicate, undefinedVars}*/var _glTexEnvfv;
69+
/**@suppress {duplicate, undefinedVars}*/var _glGetTexEnviv;
70+
/**@suppress {duplicate, undefinedVars}*/var _glGetTexEnvfv;
71+
GLEmulation.init();`,
7472
$GLEmulation: {
7573
// Fog support. Partial, we assume shaders are used that implement fog. We just pass them uniforms
7674
fogStart: 0,

‎test/browser/glut_touchevents.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ int main(int argc, char *argv[])
6868
touches.item = function(i) { return this[i]; };
6969

7070
var event = document.createEvent('UIEvent');
71-
event.target = Module['canvas'];
7271
event.button = 0;
7372
event.changedTouches = touches;
7473
event.initUIEvent(eventType, true, true, window, 1);

‎test/embind/test_pthreads.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ using namespace emscripten;
88

99
void thread(void) {
1010
EM_ASM({
11-
globalProperty = {
11+
globalThis.globalProperty = {
1212
foo: function(value) {
1313
return value;
1414
}

‎test/other/test_runtime_keepalive.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ int main() {
88
Module["onExit"] = () => { out("onExit"); };
99
runtimeKeepalivePush();
1010
out("runtimeKeepalivePush done");
11-
counter = 0;
11+
var counter = 0;
1212
function timerCallback() {
1313
if (counter < 5) {
1414
runtimeKeepalivePush();

‎test/test_browser.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -944,7 +944,7 @@ def test_sdl_stb_image_cleanup(self):
944944
'safe_heap_O2': (['-sSAFE_HEAP', '-O2'],),
945945
})
946946
def test_sdl_canvas(self, args):
947-
self.btest_exit('test_sdl_canvas.c', cflags=['-sLEGACY_GL_EMULATION', '-lSDL', '-lGL'] + args)
947+
self.btest_exit('test_sdl_canvas.c', cflags=['-sSTRICT_JS', '-sLEGACY_GL_EMULATION', '-lSDL', '-lGL'] + args)
948948

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

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

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

0 commit comments

Comments
 (0)