Skip to content

Move glfw tests into browser/interactive sub-directories. NFC #17435

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
Jul 14, 2022
Merged

Move glfw tests into browser/interactive sub-directories. NFC #17435

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
0 tests/glfw.c → tests/browser/test_glfw.c
View file
Open in desktop
File renamed without changes.
0 tests/glfw3.c → tests/browser/test_glfw3.c
View file
Open in desktop
File renamed without changes.
0 tests/glfw_events.c → tests/browser/test_glfw_events.c
View file
Open in desktop
File renamed without changes.
0 tests/test_glfw_joystick.c → tests/browser/test_glfw_joystick.c
View file
Open in desktop
File renamed without changes.
0 tests/glfw_minimal.c → tests/browser/test_glfw_minimal.c
View file
Open in desktop
File renamed without changes.
0 tests/test_glfw_time.c → tests/browser/test_glfw_time.c
View file
Open in desktop
File renamed without changes.
0 tests/test_glfw_cursor_disabled.c → ...s/interactive/test_glfw_cursor_disabled.c
View file
Open in desktop
File renamed without changes.
0 tests/test_glfw_dropfile.c → tests/interactive/test_glfw_dropfile.c
View file
Open in desktop
File renamed without changes.
0 tests/test_glfw_fullscreen.c → tests/interactive/test_glfw_fullscreen.c
View file
Open in desktop
File renamed without changes.
0 tests/test_glfw_get_key_stuck.c → tests/interactive/test_glfw_get_key_stuck.c
View file
Open in desktop
File renamed without changes.
0 tests/glfw_joystick.c → tests/interactive/test_glfw_joystick.c
View file
Open in desktop
File renamed without changes.
0 tests/test_glfw_pointerlock.c → tests/interactive/test_glfw_pointerlock.c
View file
Open in desktop
File renamed without changes.
18 changes: 9 additions & 9 deletions tests/test_browser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1241,7 +1241,7 @@ def test_glfw_joystick(self):
};
''')

self.btest_exit(test_file('test_glfw_joystick.c'), args=['-O2', '--minify=0', '-o', 'page.html', '--pre-js', 'pre.js', '-lGL', '-lglfw3', '-sUSE_GLFW=3'])
self.btest_exit(test_file('browser/test_glfw_joystick.c'), args=['-O2', '--minify=0', '-o', 'page.html', '--pre-js', 'pre.js', '-lGL', '-lglfw3', '-sUSE_GLFW=3'])

@requires_graphics_hardware
def test_webgl_context_attributes(self):
Expand Down Expand Up @@ -1580,15 +1580,15 @@ def test_sdl_fog_linear(self):

@requires_graphics_hardware
def test_glfw(self):
self.btest_exit('glfw.c', args=['-sLEGACY_GL_EMULATION', '-lglfw', '-lGL'])
self.btest_exit('glfw.c', args=['-sLEGACY_GL_EMULATION', '-sUSE_GLFW=2', '-lglfw', '-lGL'])
self.btest_exit('browser/test_glfw.c', args=['-sLEGACY_GL_EMULATION', '-lglfw', '-lGL'])
self.btest_exit('browser/test_glfw.c', args=['-sLEGACY_GL_EMULATION', '-sUSE_GLFW=2', '-lglfw', '-lGL'])

def test_glfw_minimal(self):
self.btest_exit('glfw_minimal.c', args=['-lglfw', '-lGL'])
self.btest_exit('glfw_minimal.c', args=['-sUSE_GLFW=2', '-lglfw', '-lGL'])
self.btest_exit('browser/test_glfw_minimal.c', args=['-lglfw', '-lGL'])
self.btest_exit('browser/test_glfw_minimal.c', args=['-sUSE_GLFW=2', '-lglfw', '-lGL'])

def test_glfw_time(self):
self.btest_exit('test_glfw_time.c', args=['-sUSE_GLFW=3', '-lglfw', '-lGL'])
self.btest_exit('browser/test_glfw_time.c', args=['-sUSE_GLFW=3', '-lglfw', '-lGL'])

def _test_egl_base(self, *args):
self.btest_exit(test_file('test_egl.c'), args=['-O2', '-lEGL', '-lGL'] + list(args))
Expand Down Expand Up @@ -2881,12 +2881,12 @@ def in_html(expected):
def test_glfw3(self, args):
for opts in [[], ['-sLEGACY_GL_EMULATION'], ['-Os', '--closure=1']]:
print(opts)
self.btest(test_file('glfw3.c'), args=['-sUSE_GLFW=3', '-lglfw', '-lGL'] + args + opts, expected='1')
self.btest(test_file('browser/test_glfw3.c'), args=['-sUSE_GLFW=3', '-lglfw', '-lGL'] + args + opts, expected='1')

@requires_graphics_hardware
def test_glfw_events(self):
self.btest(test_file('glfw_events.c'), args=['-sUSE_GLFW=2', "-DUSE_GLFW=2", '-lglfw', '-lGL'], expected='1')
self.btest(test_file('glfw_events.c'), args=['-sUSE_GLFW=3', "-DUSE_GLFW=3", '-lglfw', '-lGL'], expected='1')
self.btest(test_file('browser/test_glfw_events.c'), args=['-sUSE_GLFW=2', "-DUSE_GLFW=2", '-lglfw', '-lGL'], expected='1')
self.btest(test_file('browser/test_glfw_events.c'), args=['-sUSE_GLFW=3', "-DUSE_GLFW=3", '-lglfw', '-lGL'], expected='1')

@requires_graphics_hardware
def test_sdl2_image(self):
Expand Down
12 changes: 6 additions & 6 deletions tests/test_interactive.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,22 +203,22 @@ def test_freealut(self):
self.run_browser('page.html', 'You should hear "Hello World!"')

def test_glfw_cursor_disabled(self):
self.btest_exit('test_glfw_cursor_disabled.c', args=['-sUSE_GLFW=3', '-lglfw', '-lGL'])
self.btest_exit('interactive/test_glfw_cursor_disabled.c', args=['-sUSE_GLFW=3', '-lglfw', '-lGL'])

def test_glfw_dropfile(self):
self.btest_exit('test_glfw_dropfile.c', args=['-sUSE_GLFW=3', '-lglfw', '-lGL'])
self.btest_exit('interactive/test_glfw_dropfile.c', args=['-sUSE_GLFW=3', '-lglfw', '-lGL'])

def test_glfw_fullscreen(self):
self.btest_exit('test_glfw_fullscreen.c', args=['-sUSE_GLFW=3'])
self.btest_exit('interactive/test_glfw_fullscreen.c', args=['-sUSE_GLFW=3'])

def test_glfw_get_key_stuck(self):
self.btest_exit('test_glfw_get_key_stuck.c', args=['-sUSE_GLFW=3'])
self.btest_exit('interactive/test_glfw_get_key_stuck.c', args=['-sUSE_GLFW=3'])

def test_glfw_joystick(self):
self.btest_exit('glfw_joystick.c', args=['-sUSE_GLFW=3'])
self.btest_exit('interactive/test_glfw_joystick.c', args=['-sUSE_GLFW=3'])

def test_glfw_pointerlock(self):
self.btest_exit('test_glfw_pointerlock.c', args=['-sUSE_GLFW=3'])
self.btest_exit('interactive/test_glfw_pointerlock.c', args=['-sUSE_GLFW=3'])

def test_glut_fullscreen(self):
self.skipTest('looks broken')
Expand Down