.

Author: sbc100

src/preamble.js

@@ -60,7 +60,7 @@ var ABORT = false;
 // set by exit() and abort().  Passed to 'onExit' handler.
 // NOTE: This is also used as the process return code code in shell environments
 // but only when noExitRuntime is false.
-var EXITSTATUS = 0;
+var EXITSTATUS;
 
 /** @type {function(*, string=)} */
 function assert(condition, text) {

tests/browser_reporting.js

@@ -1,3 +1,5 @@
+var hasModule = typeof Module === 'object' && Module;
+
 /** @param {boolean=} sync
     @param {number=} port */
 function reportResultToServer(result, sync, port) {
@@ -7,9 +9,7 @@ function reportResultToServer(result, sync, port) {
     reportErrorToServer("excessive reported results, sending " + result + ", test will fail");
   }
   reportResultToServer.reported = true;
-
   var xhr = new XMLHttpRequest();
-  var hasModule = typeof Module === 'object' && Module;
   if (hasModule && Module['pageThrewException']) result = 12345;
   xhr.open('GET', 'http://localhost:' + port + '/report_result?' + result, !sync);
   xhr.send();
@@ -36,3 +36,13 @@ if (typeof window === 'object' && window) {
     xhr.send();
   });
 }
+
+function reportExitStatus() {
+  maybeReportResultToServer('exit:' + EXITSTATUS);
+}
+
+
+if (hasModule) {
+  Module.postRun = Module.postRun || [];
+  Module.postRun.push(reportExitStatus);
+}

tests/report_result.h

@@ -10,17 +10,15 @@
 #ifndef REPORT_RESULT_H_
 #define REPORT_RESULT_H_
 
-#include <stdio.h>
-
 #ifdef __EMSCRIPTEN__
 
-#include <emscripten.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif
+
 void _ReportResult(int result, int sync);
 void _MaybeReportResult(int result, int sync);
+
 #ifdef __cplusplus
 }
 #endif
@@ -40,7 +38,9 @@ void _MaybeReportResult(int result, int sync);
 
 #else
 
+#include <stdio.h>
 #include <stdlib.h>
+
 #define REPORT_RESULT(result)       \
   do {                              \
     printf("result: %d\n", result); \

tests/runner.py

@@ -306,6 +306,7 @@ def make_executable(name):
   'lsan',
   'wasm2ss',
   'posixtest',
+  'posixtest_browser',
 ]
 
 
@@ -1830,7 +1831,8 @@ def flattened_tests(loaded_tests):
 
 
 def suite_for_module(module, tests):
-  suite_supported = module.__name__ in ('test_core', 'test_other', 'test_posixtest')
+  # TODO(sbc): Figure out how to add posixtest here but not posixtest_browser
+  suite_supported = module.__name__ in ('test_core', 'test_other']
   if not EMTEST_SAVE_DIR:
     has_multiple_tests = len(tests) > 1
     has_multiple_cores = parallel_testsuite.num_cores() > 1

tests/test_posixtest.py

@@ -3,22 +3,34 @@
 # University of Illinois/NCSA Open Source License.  Both these licenses can be
 # found in the LICENSE file.
 
+"""Runs the pthreads test from the upstream posixtest suite in:
+   ./tests/third_party/posixtestsuite
+See
+   https://github.com/juj/posixtestsuite
+"""
+
 import glob
 import os
 
-from runner import RunnerCore, path_from_root
+from runner import RunnerCore, BrowserCore, path_from_root
 from tools import config
 from tools.shared import EMCC
 
 testsuite_root = path_from_root('tests/third_party/posixtestsuite')
 
 
 class posixtest(RunnerCore):
-  """Testsuite that is automatically pupulated from the pthread tests
-  that are part of the upstream posixtest suite in:
-     ./tests/third_party/posixtestsuite
-  See
-     https://github.com/juj/posixtestsuite
+  """Run the suite under node (and in parallel)
+
+  This class get populated dynamically below.
+  """
+  pass
+
+
+class posixtest_browser(BrowserCore):
+  """Run the suite in the browser (serially)
+
+  This class get populated dynamically below.
   """
   pass
 
@@ -95,6 +107,27 @@ def f(self):
   return f
 
 
+def make_test_browser(name, testfile):
+
+  def f(self):
+    if name in disabled:
+      self.skipTest(disabled[name])
+    args = ['-I' + os.path.join(testsuite_root, 'include'),
+            '-Werror',
+            '-Wno-format-security',
+            '-Wno-int-conversion',
+            '-sUSE_PTHREADS',
+            '-sEXIT_RUNTIME',
+            '-sTOTAL_MEMORY=268435456',
+            '-sPTHREAD_POOL_SIZE=40']
+    # Only are only needed for browser tests of the was btest
+    # injects headers using `-include` flag.
+    args += ['-Wno-macro-redefined', '-D_GNU_SOURCE']
+    self.btest(testfile, args=args, expected='exit:0')
+
+  return f
+
+
 for testdir in get_pthread_tests():
   basename = os.path.basename(testdir)
   for test_file in glob.glob(os.path.join(testdir, '*.c')):
@@ -104,3 +137,4 @@ def f(self):
     test_suffix = test_suffix.replace('-', '_')
     test_name = 'test_' + basename + '_' + test_suffix
     setattr(posixtest, test_name, make_test(test_name, test_file))
+    setattr(posixtest_browser, test_name, make_test_browser(test_name, test_file))