Split up test browser.test_glbook to separate cases. (#25588)

Split up test browser.test_glbook to separate cases. I am seeing some
flakiness in this test, so splitting the test up in separate parts to
see which part specifically is flaking.

Author: juj

test/test_browser.py

@@ -1788,10 +1788,21 @@ def test_glgears_deriv(self):
     assert 'gl-matrix' not in read_file('test.html'), 'Should not include glMatrix when not needed'
 
   @requires_graphics_hardware
-  def test_glbook(self):
+  @parameterized({
+    'Hello_Triangle': ('CH02_HelloTriangle.o', [], []),
+    'Simple_VertexShader': ('CH08_SimpleVertexShader.o', [], []),
+    'Simple_Texture2D': ('CH09_SimpleTexture2D.o', [], []),
+    'Simple_TextureCubemap': ('CH09_TextureCubemap.o', [], []),
+    'TextureWrap': ('CH09_TextureWrap.o', [], []),
+    'MultiTexture': ('CH10_MultiTexture.o', ['Chapter_10/MultiTexture/basemap.tga', 'Chapter_10/MultiTexture/lightmap.tga'], []),
+    # run this individual test with optimizations and closure for more coverage
+    'ParticleSystem': ('CH13_ParticleSystem.o', ['Chapter_13/ParticleSystem/smoke.tga'], ['-O2']),
+  })
+  def test_glbook(self, program, images, cflags):
     self.cflags.append('-Wno-int-conversion')
     self.cflags.append('-Wno-pointer-sign')
-    programs = self.get_library('third_party/glbook', [
+
+    libs = self.get_library('third_party/glbook', [
       'Chapter_2/Hello_Triangle/CH02_HelloTriangle.o',
       'Chapter_8/Simple_VertexShader/CH08_SimpleVertexShader.o',
       'Chapter_9/Simple_Texture2D/CH09_SimpleTexture2D.o',
@@ -1804,19 +1815,13 @@ def test_glbook(self):
     def book_path(path):
       return test_file('third_party/glbook', path)
 
-    for program in programs:
-      print(program)
-      basename = os.path.basename(program)
-      args = ['-lGL', '-lEGL', '-lX11']
-      if basename == 'CH10_MultiTexture.o':
-        shutil.copy(book_path('Chapter_10/MultiTexture/basemap.tga'), '.')
-        shutil.copy(book_path('Chapter_10/MultiTexture/lightmap.tga'), '.')
-        args += ['--preload-file', 'basemap.tga', '--preload-file', 'lightmap.tga']
-      elif basename == 'CH13_ParticleSystem.o':
-        shutil.copy(book_path('Chapter_13/ParticleSystem/smoke.tga'), '.')
-        args += ['--preload-file', 'smoke.tga', '-O2'] # test optimizations and closure here as well for more coverage
-
-      self.reftest(program, book_path(basename.replace('.o', '.png')), cflags=args)
+    cflags += ['-lGL', '-lEGL', '-lX11']
+    for image in images:
+      cflags += ['--preload-file', f'{book_path(image)}@{os.path.basename(image)}']
+
+    lib = [l for l in libs if program in os.path.basename(l)][0]
+
+    self.reftest(lib, book_path(program.replace('.o', '.png')), cflags=cflags)
 
   @requires_graphics_hardware
   @parameterized({