Remove (broken) EMTEST_BROWSER_PORT test setting

The `browser_reporting.js` file (which does most of the reporting
these days) was not honoring it anyway.  I've never found the need to
configure this in all the years I've been working on emscripten so
hopefully we don't need to bring it back.

Author: sbc100

test/browser_reporting.js

@@ -1,10 +1,8 @@
 var hasModule = typeof Module === 'object' && Module;
 
-/**
- * @param {number=} port
- */
-function reportResultToServer(result, port) {
-  port = port || 8888;
+var reportingURL = 'http://localhost:8888/';
+
+function reportResultToServer(result) {
   if (reportResultToServer.reported) {
     // Only report one result per test, even if the test misbehaves and tries to report more.
     reportErrorToServer(`excessive reported results, sending ${result}, test will fail`);
@@ -14,7 +12,7 @@ function reportResultToServer(result, port) {
     out(`RESULT: ${result}`);
   } else {
     let doFetch = typeof origFetch != 'undefined' ? origFetch : fetch;
-    doFetch(`http://localhost:${port}/report_result?${encodeURIComponent(result)}`).then(() => {
+    doFetch(`${reportingURL}/report_result?${encodeURIComponent(result)}`).then(() => {
       if (typeof window === 'object' && window && hasModule && !Module['pageThrewException']) {
         /* for easy debugging, don't close window on failure */
         window.close();
@@ -24,26 +22,24 @@ function reportResultToServer(result, port) {
 }
 
 function sendFileToServer(filename, contents) {
-  fetch(`http://localhost:8888/?file=${encodeURIComponent(filename)}`, {method: "POST", body: contents});
+  fetch(`${reportingURL}/?file=${encodeURIComponent(filename)}`, {method: "POST", body: contents});
 }
 
-/**
- * @param {number=} port
- */
-function maybeReportResultToServer(result, port) {
-  if (reportResultToServer.reported) return;
-  reportResultToServer(result, port);
+function maybeReportResultToServer(result) {
+  if (!reportResultToServer.reported) {
+    reportResultToServer(result);
+  }
 }
 
 function reportErrorToServer(message) {
   if (typeof ENVIRONMENT_IS_NODE !== 'undefined' && ENVIRONMENT_IS_NODE) {
     err(message);
   } else {
-    fetch(`http://localhost:8888?stderr=${encodeURIComponent(message)}`);
+    fetch(`${reportingURL}?stderr=${encodeURIComponent(message)}`);
   }
 }
 
-function report_error(e) {
+function reportError(e) {
   // MINIMAL_RUNTIME doesn't handle exit or call the below onExit handler
   // so we detect the exit by parsing the uncaught exception message.
   var message = e.message || e;
@@ -68,9 +64,9 @@ function report_error(e) {
 
 if (typeof window === 'object' && window) {
   window.addEventListener('error', event => {
-    report_error(event.error || event)
+    reportError(event.error || event)
   });
-  window.addEventListener('unhandledrejection', event => report_error(event.reason));
+  window.addEventListener('unhandledrejection', event => reportError(event.reason));
 }
 
 if (hasModule) {

test/common.py

@@ -2072,6 +2072,9 @@ class BrowserCore(RunnerCore):
   # suite early, as otherwise we will wait for the timeout on every
   # single test (hundreds of minutes)
   MAX_UNRESPONSIVE_TESTS = 10
+  PORT = 8888
+  HARNESS_URL = 'http://localhost:%s/run_harness' % PORT
+  BROWSER_TIMEOUT = 60
 
   unresponsive_tests = 0
 
@@ -2091,7 +2094,7 @@ def browser_restart(cls):
       logger.info('Browser did not respond to `terminate`.  Using `kill`')
       cls.browser_proc.kill()
       cls.browser_proc.wait()
-    cls.browser_open(cls.harness_url)
+    cls.browser_open(cls.HARNESS_URL)
 
   @classmethod
   def browser_open(cls, url):
@@ -2106,17 +2109,14 @@ def browser_open(cls, url):
   @classmethod
   def setUpClass(cls):
     super().setUpClass()
-    cls.port = int(os.getenv('EMTEST_BROWSER_PORT', '8888'))
     if not has_browser() or EMTEST_BROWSER == 'node':
       return
-    cls.browser_timeout = 60
     cls.harness_in_queue = multiprocessing.Queue()
     cls.harness_out_queue = multiprocessing.Queue()
-    cls.harness_server = multiprocessing.Process(target=harness_server_func, args=(cls.harness_in_queue, cls.harness_out_queue, cls.port))
+    cls.harness_server = multiprocessing.Process(target=harness_server_func, args=(cls.harness_in_queue, cls.harness_out_queue, cls.PORT))
     cls.harness_server.start()
     print('[Browser harness server on process %d]' % cls.harness_server.pid)
-    cls.harness_url = 'http://localhost:%s/run_harness' % cls.port
-    cls.browser_open(cls.harness_url)
+    cls.browser_open(cls.HARNESS_URL)
 
   @classmethod
   def tearDownClass(cls):
@@ -2158,11 +2158,11 @@ def run_browser(self, html_file, expected=None, message=None, timeout=None, extr
     if expected is not None:
       try:
         self.harness_in_queue.put((
-          'http://localhost:%s/%s' % (self.port, html_file),
+          'http://localhost:%s/%s' % (self.PORT, html_file),
           self.get_dir()
         ))
         if timeout is None:
-          timeout = self.browser_timeout
+          timeout = self.BROWSER_TIMEOUT
         try:
           output = self.harness_out_queue.get(block=True, timeout=timeout)
         except queue.Empty:
@@ -2213,7 +2213,6 @@ def compile_btest(self, filename, args, reporting=Reporting.FULL):
         # If C reporting (i.e. the REPORT_RESULT macro) is required we
         # also include report_result.c and force-include report_result.h
         self.run_process([EMCC, '-c', '-I' + TEST_ROOT,
-                          '-DEMTEST_PORT_NUMBER=%d' % self.port,
                           test_file('report_result.c')] + self.get_emcc_args(compile_only=True) + (['-fPIC'] if '-fPIC' in args else []))
         args += ['report_result.o', '-include', test_file('report_result.h')]
     if EMTEST_BROWSER == 'node':

test/report_result.c

@@ -20,20 +20,13 @@ extern "C" {
 #endif
 
 #if defined __EMSCRIPTEN__ && !defined EMTEST_NODE
-#ifndef EMTEST_PORT_NUMBER
-#error "EMTEST_PORT_NUMBER not defined"
-#endif
 
 void EMSCRIPTEN_KEEPALIVE _ReportResult(int result) {
-  EM_ASM({
-    reportResultToServer($0, $1);
-  }, result, EMTEST_PORT_NUMBER);
+  EM_ASM(reportResultToServer($0), result);
 }
 
 void EMSCRIPTEN_KEEPALIVE _MaybeReportResult(int result) {
-  EM_ASM({
-    maybeReportResultToServer($0, $1);
-  }, result, EMTEST_PORT_NUMBER);
+  EM_ASM(maybeReportResultToServer($0), result);
 }
 
 #else