From b43f726b0fa20100dff233f21606673ee4e8291a Mon Sep 17 00:00:00 2001 From: Sam Clegg Date: Thu, 1 Feb 2024 17:22:27 -0800 Subject: [PATCH] [test] Simplify post_manual_reftest. NFC Rather than embedding `reftest.js` directly in the html, simply include it via script src attribute. --- test/test_browser.py | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/test/test_browser.py b/test/test_browser.py index d3318222d1cb8..e5b91b39055ed 100644 --- a/test/test_browser.py +++ b/test/test_browser.py @@ -865,20 +865,18 @@ def post_manual_reftest(self): assert os.path.exists('reftest.js') html = read_file('test.html') html = html.replace('', ''' + -''' % read_file('reftest.js')) +''') create_file('test.html', html) def test_sdl_canvas_proxy(self): @@ -2108,7 +2106,7 @@ def test_cubegeom_pre3(self): def test_cubegeom(self, args): # proxy only in the simple, normal case (we can't trace GL calls when # proxied) - self.btest('third_party/cubegeom/cubegeom.c', reference='third_party/cubegeom/cubegeom.png', args=['-O2', '-g', '-sLEGACY_GL_EMULATION', '-lGL', '-lSDL'] + args, also_proxied=not args) + self.btest('third_party/cubegeom/cubegeom.c', reference='third_party/cubegeom/cubegeom.png', args=['-O2', '-g', '-sLEGACY_GL_EMULATION', '-lGL', '-lSDL'] + args) @requires_graphics_hardware def test_cubegeom_regal(self): @@ -3362,10 +3360,10 @@ def test_sdl2_canvas_write(self): def test_sdl2_gl_frames_swap(self): def post_build(): self.post_manual_reftest() - html = read_file('test.html') - html2 = html.replace('''Module['postRun'] = doReftest;''', '') # we don't want the very first frame - assert html != html2 - create_file('test.html', html2) + reftest = read_file('reftest.js') + reftest2 = reftest.replace("Module['postRun'] = doReftest;", '') # we don't want the very first frame + assert reftest != reftest2 + create_file('reftest.js', reftest2) self.btest('test_sdl2_gl_frames_swap.c', reference='browser/test_sdl2_gl_frames_swap.png', args=['--proxy-to-worker', '-sGL_TESTING', '-sUSE_SDL=2'], manual_reference=True, post_build=post_build) @no_wasm64('SDL2 + wasm64')