Skip to content

Commit f9ca632

Browse files
authored
[test] Remove un-needed cflags from browser_tests. NFC (#23586)
While updating the cflags for `full_es2_sdlproc.c` I also updated to return 0 rather than 1 which is the convention in our tests.
1 parent a4f64a3 commit f9ca632

File tree

3 files changed

+4
-12
lines changed

3 files changed

+4
-12
lines changed

test/browser/webgl_timer_query.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ int main() {
8686

8787
/* Check if the extension is actually supported. Firefox reports
8888
EXT_disjoint_timer_query on WebGL 2 as well. */
89-
if (!strstr(glGetString(GL_EXTENSIONS), "EXT_disjoint_timer_query")) {
89+
if (!strstr((const char*)glGetString(GL_EXTENSIONS), "EXT_disjoint_timer_query")) {
9090
printf("EXT_disjoint_timer_query[_webgl2] not supported\n");
9191
return 0;
9292
}

test/full_es2_sdlproc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -731,5 +731,5 @@ main(int argc, char *argv[])
731731
gears_init();
732732
gears_draw();
733733

734-
return 1;
734+
return 0;
735735
}

test/test_browser.py

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -236,14 +236,6 @@ def setUpClass(cls):
236236
print('Running the browser tests. Make sure the browser allows popups from localhost.')
237237
print()
238238

239-
def setUp(self):
240-
super().setUp()
241-
# avoid various compiler warnings that many browser tests currently generate
242-
self.emcc_args += [
243-
'-Wno-pointer-sign',
244-
'-Wno-int-conversion',
245-
]
246-
247239
def proxy_to_worker(self):
248240
self.emcc_args += ['--proxy-to-worker', '-sGL_TESTING']
249241

@@ -1784,7 +1776,7 @@ def test_glgears_animation(self, filename):
17841776

17851777
@requires_graphics_hardware
17861778
def test_fulles2_sdlproc(self):
1787-
self.btest_exit('full_es2_sdlproc.c', assert_returncode=1, args=['-sGL_TESTING', '-DHAVE_BUILTIN_SINCOS', '-sFULL_ES2', '-lGL', '-lSDL', '-lglut', '-sGL_ENABLE_GET_PROC_ADDRESS'])
1779+
self.btest_exit('full_es2_sdlproc.c', args=['-sGL_TESTING', '-DHAVE_BUILTIN_SINCOS', '-sFULL_ES2', '-lGL', '-lSDL', '-lglut', '-sGL_ENABLE_GET_PROC_ADDRESS', '-Wno-int-conversion'])
17881780

17891781
@requires_graphics_hardware
17901782
def test_glgears_deriv(self):
@@ -1850,7 +1842,7 @@ def test_gles2_emulation(self, args):
18501842
test_file('third_party/glbook/Common/esShader.c'),
18511843
test_file('third_party/glbook/Common/esShapes.c'),
18521844
test_file('third_party/glbook/Common/esTransform.c'),
1853-
'-lGL', '-lEGL', '-lX11',
1845+
'-lGL', '-lEGL', '-lX11', '-Wno-int-conversion', '-Wno-pointer-sign',
18541846
'--preload-file', 'basemap.tga', '--preload-file', 'lightmap.tga', '--preload-file', 'smoke.tga'] + args)
18551847

18561848
@requires_graphics_hardware

0 commit comments

Comments
 (0)