Convert more browser tests to btest_exit. NFC (#16535)

Author: sbc100

tests/browser/test_em_asm_blocking.cpp

@@ -1,5 +1,5 @@
 #include <assert.h>
-#include <emscripten.h>
+#include <emscripten/em_asm.h>
 #include <stdio.h>
 #include <thread>
 #include <math.h>
@@ -18,15 +18,12 @@ void foo() {
   });
   printf("almost PI: %f\n", almost_PI);
   assert(fabs(almost_PI - 3.14159) < 0.001);
-  atomic_store(&ret, len);
+  ret = len;
 }
 
 int main() {
   std::thread t(foo);
   t.join();
-  printf("ret: %d\n", atomic_load(&ret));
-#ifdef REPORT_RESULT
-  REPORT_RESULT(atomic_load(&ret));
-#endif
-  return atomic_load(&ret);
+  printf("ret: %d\n", ret.load());
+  return ret.load();
 }

tests/fs/test_lz4fs.cpp

@@ -14,9 +14,7 @@
 
 double before_it_all;
 
-extern "C" {
-
-void EMSCRIPTEN_KEEPALIVE finish() {
+extern "C" void EMSCRIPTEN_KEEPALIVE finish() {
   // load some file data, SYNCHRONOUSLY :)
   char buffer[100];
   int num;
@@ -123,9 +121,7 @@ void EMSCRIPTEN_KEEPALIVE finish() {
 #else
   result = 2;
 #endif
-  REPORT_RESULT(result);
-}
-
+  emscripten_force_exit(result);
 }
 
 int main() {

tests/fs/test_memfs_fsync.c

@@ -5,18 +5,16 @@
  * found in the LICENSE file.
  */
 
+#include <assert.h>
 #include <stdio.h>
-#include <emscripten.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <sys/stat.h>
 #include <errno.h>
 #include <string.h>
 
-int result = 1;
-
 int main() {
-  int fd;
+  int fd, rtn;
 
   // We first make sure the file doesn't currently exist.
   // We then write a file, call fsync, and close the file,
@@ -25,22 +23,20 @@ int main() {
   struct stat st;
 
   // a file whose contents are just 'az'
-  if ((stat("/wakaka.txt", &st) != -1) || (errno != ENOENT))
-    result = -1000 - errno;
+  rtn = stat("/wakaka.txt", &st);
+  assert(rtn == -1 && errno == ENOENT);
+
   fd = open("/wakaka.txt", O_RDWR | O_CREAT, 0666);
-  if (fd == -1)
-    result = -2000 - errno;
-  else
-  {
-    if (write(fd,"az",2) != 2)
-      result = -3000 - errno;
+  assert(fd >= 0);
+
+  rtn = write(fd, "az", 2);
+  assert(rtn == 2);
 
-    if (fsync(fd) != 0)
-      result = -4000 - errno;
+  rtn = fsync(fd);
+  assert(rtn == 0);
 
-    if (close(fd) != 0)
-      result = -5000 - errno;
-  }
+  rtn = close(fd);
+  assert(rtn == 0);
 
-  REPORT_RESULT(result);
+  return 0;
 }

tests/fs/test_workerfs_read.c

@@ -5,9 +5,10 @@
  * found in the LICENSE file.
  */
 
-#include <emscripten.h>
+#include <assert.h>
 #include <sys/stat.h>
 #include <stdio.h>
+#include <stdbool.h>
 #include <string.h>
 #include <errno.h>
 #include <unistd.h>
@@ -16,94 +17,60 @@
 
 #define SECRET_LEN 10
 
-int result = 1;
-
 int main() {
   int fd;
   int fd2;
+  int rtn;
   struct stat st;
   struct stat st2;
   char buf[100];
   char secret2[] = SECRET2;
   int len2 = SECRET_LEN / 2;
 
-  if (stat("/work/notexist.txt", &st) != -1 || errno != ENOENT) {
-    result = -1000 - errno;
-    goto exit;
-  }
+  rtn = stat("/work/notexist.txt", &st);
+  assert(rtn == -1 && errno == ENOENT);
 
-  if (stat("/work/blob.txt", &st) != 0) {
-    result = -2000 - errno;
-    goto exit;
-  }
+  rtn = stat("/work/blob.txt", &st);
+  assert(rtn == 0);
 
   fd = open("/work/blob.txt", O_RDWR, 0666);
-  if (fd == -1) {
-    result = -3000 - errno;
-    goto exit;
-  }
+  assert(fd >= 0);
 
-  if (read(fd, buf, 1000) != SECRET_LEN ||
-      strncmp(buf, SECRET, SECRET_LEN) != 0) {
-    result = -4000 - errno;
-    goto exit;
-  }
+  rtn = read(fd, buf, 1000);
+  assert(rtn == SECRET_LEN);
+  assert(strncmp(buf, SECRET, SECRET_LEN) == 0);
 
   fd2 = open("/work/file.txt", O_RDONLY, 0666);
-  if (fd2 == -1) {
-    result = -5000 - errno;
-    goto exit;
-  }
+  assert(fd2 != -1);
 
-  if (lseek(fd2, len2, SEEK_SET) != len2) {
-    result = -6000 - errno;
-    goto exit;
-  }
+  rtn = lseek(fd2, len2, SEEK_SET);
+  assert(rtn == len2);
 
-  if (read(fd2, buf, len2) != len2 ||
-      strncmp(buf, secret2 + len2, len2) != 0) {
-    result = -7000 - errno;
-    goto exit;
-  }
+  rtn = read(fd2, buf, len2);
+  assert(rtn == len2);
+  assert(strncmp(buf, secret2 + len2, len2) == 0);
 
   stat("/work/file.txt", &st);
   chmod("/work/file.txt", 0640);
   stat("/work/file.txt", &st2);
-  if (st.st_mode != (0777 | S_IFREG) || st2.st_mode != (0640 | S_IFREG)) {
-    result = -8000 - errno;
-    goto exit;
-  }
- 
+  assert(st.st_mode == (0777 | S_IFREG) && st2.st_mode == (0640 | S_IFREG));
+
   DIR *pDir = opendir("/work/");
-  if (pDir == NULL) {
-    result = -9000 - errno;
-    goto exit;
-  }
-  
+  assert(pDir);
+
   int blobFileExists = 0;
   int fileTxtExists = 0;
   struct dirent *pDirent;
   while ((pDirent = readdir(pDir)) != NULL) {
     if (strcmp(pDirent->d_name, "blob.txt") == 0) {
        blobFileExists = 1;
-    }   
+    }
     if (strcmp(pDirent->d_name, "file.txt") == 0) {
        fileTxtExists = 1;
     }
- 
-  }
-  
-  if (blobFileExists == 0) {
-    result = -10000-errno;
-    goto exit;
   }
-  
-  if (fileTxtExists == 0) {
-    result = -20000-errno;
-    goto exit;
-  }
-
 
-exit:
-  REPORT_RESULT(result);
+  assert(blobFileExists);
+  assert(fileTxtExists);
+  return 0;
 }

tests/hello_world_sdl.cpp

@@ -10,7 +10,7 @@
 #include <emscripten.h>
 #endif
 
-extern "C" int main(int argc, char** argv) {
+int main(int argc, char** argv) {
   printf("hello, world!\n");
 
   SDL_Init(SDL_INIT_VIDEO);

tests/sdl_free_screen.cpp

@@ -6,9 +6,7 @@
 #include <stdio.h>
 #include <SDL/SDL.h>
 
-
-extern "C" int main(int argc, char** argv) {
-
+int main(int argc, char** argv) {
   SDL_Init(SDL_INIT_VIDEO);
   SDL_Surface *screen = SDL_SetVideoMode(256, 256, 32, SDL_SWSURFACE);
   printf("freeing screen...\n");

tests/sdl_key.c

@@ -42,9 +42,8 @@ int SDLCALL EventHandler(void *userdata, SDL_Event *event) {
             printf("b scancode\n"); result *= 23; break;
           }
           printf("unknown key: sym %d scancode %d\n", event->key.keysym.sym, event->key.keysym.scancode);
-          REPORT_RESULT(result);
-          emscripten_run_script("throw 'done'"); // comment this out to leave event handling active. Use the following to log DOM keys:
-                                                 // addEventListener('keyup', function(event) { console.log(event->keyCode) }, true)
+          emscripten_force_exit(result); // comment this out to leave event handling active. Use the following to log DOM keys:
+                                         // addEventListener('keyup', function(event) { console.log(event->keyCode) }, true)
         }
       }
       break;

tests/test_browser.py

@@ -873,8 +873,8 @@ def test_sdl_key(self):
              %s
             }
           ''' % ('setTimeout(function() {' if delay else '', '}, 1);' if delay else '', 'setTimeout(function() {' if delay else '', '}, 1);' if delay else ''))
-          self.compile_btest([test_file('sdl_key.c'), '-o', 'page.html'] + defines + async_ + ['--pre-js', 'pre.js', '-sEXPORTED_FUNCTIONS=_main', '-lSDL', '-lGL'])
-          self.run_browser('page.html', '', '/report_result?223092870')
+          self.compile_btest([test_file('sdl_key.c'), '-o', 'page.html'] + defines + async_ + ['--pre-js', 'pre.js', '-sEXPORTED_FUNCTIONS=_main', '-lSDL', '-lGL', '-sEXIT_RUNTIME'])
+          self.run_browser('page.html', '', '/report_result?exit:223092870')
 
   def test_sdl_key_proxy(self):
     create_file('pre.js', '''
@@ -1359,7 +1359,7 @@ def test_fs_idbfs_fsync(self):
   def test_fs_memfs_fsync(self):
     args = ['-sASYNCIFY', '-sEXIT_RUNTIME']
     secret = str(time.time())
-    self.btest(test_file('fs/test_memfs_fsync.c'), '1', args=args + ['-DSECRET=\"' + secret + '\"'])
+    self.btest_exit(test_file('fs/test_memfs_fsync.c'), args=args + ['-DSECRET=\"' + secret + '\"'])
 
   def test_fs_workerfs_read(self):
     secret = 'a' * 10
@@ -1376,7 +1376,7 @@ def test_fs_workerfs_read(self):
         }, '/work');
       };
     ''' % (secret, secret2))
-    self.btest(test_file('fs/test_workerfs_read.c'), '1', args=['-lworkerfs.js', '--pre-js', 'pre.js', '-DSECRET=\"' + secret + '\"', '-DSECRET2=\"' + secret2 + '\"', '--proxy-to-worker', '-lworkerfs.js'])
+    self.btest_exit(test_file('fs/test_workerfs_read.c'), args=['-lworkerfs.js', '--pre-js', 'pre.js', '-DSECRET=\"' + secret + '\"', '-DSECRET2=\"' + secret2 + '\"', '--proxy-to-worker', '-lworkerfs.js'])
 
   def test_fs_workerfs_package(self):
     create_file('file1.txt', 'first')
@@ -1396,37 +1396,37 @@ def test_fs_lz4fs_package(self):
 
     # compress in emcc, -sLZ4 tells it to tell the file packager
     print('emcc-normal')
-    self.btest(Path('fs/test_lz4fs.cpp'), '2', args=['-sLZ4=1', '--preload-file', 'file1.txt', '--preload-file', 'subdir/file2.txt', '--preload-file', 'file3.txt'])
+    self.btest_exit(Path('fs/test_lz4fs.cpp'), 2, args=['-sLZ4=1', '--preload-file', 'file1.txt', '--preload-file', 'subdir/file2.txt', '--preload-file', 'file3.txt'])
     assert os.path.getsize('file1.txt') + os.path.getsize(Path('subdir/file2.txt')) + os.path.getsize('file3.txt') == 3 * 1024 * 128 * 10 + 1
     assert os.path.getsize('test.data') < (3 * 1024 * 128 * 10) / 2  # over half is gone
     print('    emcc-opts')
-    self.btest(Path('fs/test_lz4fs.cpp'), '2', args=['-sLZ4=1', '--preload-file', 'file1.txt', '--preload-file', 'subdir/file2.txt', '--preload-file', 'file3.txt', '-O2'])
+    self.btest_exit(Path('fs/test_lz4fs.cpp'), 2, args=['-sLZ4=1', '--preload-file', 'file1.txt', '--preload-file', 'subdir/file2.txt', '--preload-file', 'file3.txt', '-O2'])
 
     # compress in the file packager, on the server. the client receives compressed data and can just use it. this is typical usage
     print('normal')
     out = subprocess.check_output([FILE_PACKAGER, 'files.data', '--preload', 'file1.txt', 'subdir/file2.txt', 'file3.txt', '--lz4'])
     create_file('files.js', out, binary=True)
-    self.btest(Path('fs/test_lz4fs.cpp'), '2', args=['--pre-js', 'files.js', '-sLZ4=1', '-sFORCE_FILESYSTEM'])
+    self.btest_exit(test_file('fs/test_lz4fs.cpp'), 2, args=['--pre-js', 'files.js', '-sLZ4=1', '-sFORCE_FILESYSTEM'])
     print('    opts')
-    self.btest(Path('fs/test_lz4fs.cpp'), '2', args=['--pre-js', 'files.js', '-sLZ4=1', '-sFORCE_FILESYSTEM', '-O2'])
+    self.btest_exit(test_file('fs/test_lz4fs.cpp'), 2, args=['--pre-js', 'files.js', '-sLZ4=1', '-sFORCE_FILESYSTEM', '-O2'])
     print('    modularize')
-    self.compile_btest([test_file('fs/test_lz4fs.cpp'), '--pre-js', 'files.js', '-sLZ4=1', '-sFORCE_FILESYSTEM', '-sMODULARIZE=1'])
+    self.compile_btest([test_file('fs/test_lz4fs.cpp'), '--pre-js', 'files.js', '-sLZ4=1', '-sFORCE_FILESYSTEM', '-sMODULARIZE=1', '-sEXIT_RUNTIME'])
     create_file('a.html', '''
       <script src="a.out.js"></script>
       <script>
         Module()
       </script>
     ''')
-    self.run_browser('a.html', '.', '/report_result?2')
+    self.run_browser('a.html', '.', '/report_result?exit:2')
 
     # load the data into LZ4FS manually at runtime. This means we compress on the client. This is generally not recommended
     print('manual')
     subprocess.check_output([FILE_PACKAGER, 'files.data', '--preload', 'file1.txt', 'subdir/file2.txt', 'file3.txt', '--separate-metadata', '--js-output=files.js'])
-    self.btest(Path('fs/test_lz4fs.cpp'), '1', args=['-DLOAD_MANUALLY', '-sLZ4=1', '-sFORCE_FILESYSTEM'])
+    self.btest_exit(test_file('fs/test_lz4fs.cpp'), 1, args=['-DLOAD_MANUALLY', '-sLZ4=1', '-sFORCE_FILESYSTEM'])
     print('    opts')
-    self.btest(Path('fs/test_lz4fs.cpp'), '1', args=['-DLOAD_MANUALLY', '-sLZ4=1', '-sFORCE_FILESYSTEM', '-O2'])
+    self.btest_exit(test_file('fs/test_lz4fs.cpp'), 1, args=['-DLOAD_MANUALLY', '-sLZ4=1', '-sFORCE_FILESYSTEM', '-O2'])
     print('    opts+closure')
-    self.btest(Path('fs/test_lz4fs.cpp'), '1', args=['-DLOAD_MANUALLY', '-sLZ4=1', '-sFORCE_FILESYSTEM', '-O2', '--closure=1', '-g1', '-sCLOSURE_WARNINGS=quiet'])
+    self.btest_exit(test_file('fs/test_lz4fs.cpp'), 1, args=['-DLOAD_MANUALLY', '-sLZ4=1', '-sFORCE_FILESYSTEM', '-O2', '--closure=1', '-g1', '-sCLOSURE_WARNINGS=quiet'])
 
     '''# non-lz4 for comparison
     try:
@@ -1438,7 +1438,7 @@ def test_fs_lz4fs_package(self):
     shutil.copyfile('file3.txt', Path('files/file3.txt'))
     out = subprocess.check_output([FILE_PACKAGER, 'files.data', '--preload', 'files/file1.txt', 'files/file2.txt', 'files/file3.txt'])
     create_file('files.js', out, binary=True)
-    self.btest(Path('fs/test_lz4fs.cpp'), '2', args=['--pre-js', 'files.js'])'''
+    self.btest_exit(test_file('fs/test_lz4fs.cpp'), 2, args=['--pre-js', 'files.js'])'''
 
   def test_separate_metadata_later(self):
     # see issue #6654 - we need to handle separate-metadata both when we run before
@@ -4251,8 +4251,8 @@ def test_main_thread_async_em_asm(self):
   def test_main_thread_em_asm_blocking(self):
     create_file('page.html', read_file(test_file('browser/test_em_asm_blocking.html')))
 
-    self.compile_btest([test_file('browser/test_em_asm_blocking.cpp'), '-O2', '-o', 'wasm.js', '-sUSE_PTHREADS', '-sPROXY_TO_PTHREAD'])
-    self.run_browser('page.html', '', '/report_result?8')
+    self.compile_btest([test_file('browser/test_em_asm_blocking.cpp'), '-O2', '-o', 'wasm.js', '-sUSE_PTHREADS', '-sPROXY_TO_PTHREAD', '-sEXIT_RUNTIME'])
+    self.run_browser('page.html', '', '/report_result?exit:8')
 
   # Test that it is possible to send a signal via calling alarm(timeout), which in turn calls to the signal handler set by signal(SIGALRM, func);
   def test_sigalrm(self):