Use btest_exit for test_gl_textures and test_html5_core. NFC (#18774)

These are the two tests otherwise starting failing with #18770. The
reason is that.

Author: sbc100

test/gl_textures.cpp

@@ -12,18 +12,6 @@
 #include <assert.h>
 #include <stdlib.h>
 
-void report_result(int result)
-{
-  if (result == 0) {
-    printf("Test successful!\n");
-  } else {
-    printf("Test failed!\n");
-  }
-#ifdef REPORT_RESULT
-  REPORT_RESULT(result);
-#endif
-}
-
 GLuint program;
 
 #define PIX_C(x, y) ((x)/256.0f + (y)/256.0f)
@@ -53,7 +41,13 @@ void draw()
       assert(fabs((int)eRed - red) <= 2);
     }
   emscripten_cancel_main_loop();
-  report_result(0);
+  printf("Test successful!\n");
+#if _REENTRANT
+  // In PROXY_TO_PTHREAD mode its currently not enough to cancel the main
+  // loop and have the application exit:
+  // https://github.com/emscripten-core/emscripten/issues/18773
+  exit(0);
+#endif
 }
 
 int main()
@@ -81,7 +75,7 @@ int main()
     char *buf = new char[maxLength];
     glGetShaderInfoLog(vs, maxLength, &maxLength, buf);
     printf("%s\n", buf);
-    return 0;
+    return 1;
   }
 
   GLuint ps = glCreateShader(GL_FRAGMENT_SHADER);
@@ -96,7 +90,7 @@ int main()
     char *buf = new char[maxLength];
     glGetShaderInfoLog(ps, maxLength, &maxLength, buf);
     printf("%s\n", buf);
-    return 0;
+    return 1;
   }
 
   program = glCreateProgram();
@@ -112,7 +106,7 @@ int main()
     char *buf = new char[maxLength];
     glGetProgramInfoLog(program, maxLength, &maxLength, buf);
     printf("%s\n", buf);
-    return 0;
+    return 1;
   }
 
   glUseProgram(program);

test/test_browser.py

@@ -2010,7 +2010,7 @@ def test_gl_glteximage(self):
   @requires_graphics_hardware
   @requires_threads
   def test_gl_textures(self, args):
-    self.btest('gl_textures.cpp', '0', args=['-lGL'] + args)
+    self.btest_exit('gl_textures.cpp', args=['-lGL'] + args)
 
   @requires_graphics_hardware
   def test_gl_ps(self):
@@ -2674,7 +2674,7 @@ def test_html5_core(self, opts):
       });
       ''')
       self.emcc_args.append('--pre-js=pre.js')
-    self.btest(test_file('test_html5_core.c'), args=opts, expected='0')
+    self.btest_exit(test_file('test_html5_core.c'), args=opts)
 
   @requires_threads
   def test_html5_gamepad(self):

test/test_html5_core.c

@@ -238,11 +238,11 @@ EM_BOOL webglcontext_callback(int eventType, const void *reserved, void *userDat
   return 0;
 }
 
-#ifdef REPORT_RESULT
-void report_result(void *arg)
+#ifndef KEEP_ALIVE
+void test_done(void *arg)
 {
   emscripten_html5_remove_all_event_listeners();
-  REPORT_RESULT(0);
+  exit(0);
 }
 #endif
 
@@ -428,11 +428,11 @@ int main()
   ret = (width && height) ? EMSCRIPTEN_RESULT_SUCCESS : EMSCRIPTEN_RESULT_FAILED;
   TEST_RESULT(emscripten_get_screen_size);
 
-#ifdef REPORT_RESULT
-  // Keep the page running for a moment.
-  emscripten_async_call(report_result, 0, 5000);
-#else
+#ifdef KEEP_ALIVE
   emscripten_exit_with_live_runtime();
+#else
+  // Keep the page running for a moment.
+  emscripten_async_call(test_done, 0, 5000);
 #endif
   return 0;
 }