latest xharness

.config/dotnet-tools.json

@@ -15,7 +15,7 @@
       ]
     },
     "microsoft.dotnet.xharness.cli": {
-      "version": "1.0.0-prerelease.21572.1",
+      "version": "1.0.0-prerelease.21572.4",
       "commands": [
         "xharness"
       ]

eng/Version.Details.xml

@@ -202,13 +202,13 @@
       <Uri>https://github.com/dotnet/linker</Uri>
       <Sha>f2dd65f51f6096f25e00e0d1e4c6af0e85d41865</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.21572.1">
+    <Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.21572.4">
       <Uri>https://github.com/dotnet/xharness</Uri>
-      <Sha>ce11017eeda6622405543e33259a1ec7f75c14ba</Sha>
+      <Sha>7aa4d338b58a2b21974933802bd731a64c36c1d8</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="1.0.0-prerelease.21572.1">
+    <Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="1.0.0-prerelease.21572.4">
       <Uri>https://github.com/dotnet/xharness</Uri>
-      <Sha>ce11017eeda6622405543e33259a1ec7f75c14ba</Sha>
+      <Sha>7aa4d338b58a2b21974933802bd731a64c36c1d8</Sha>
     </Dependency>
     <Dependency Name="Microsoft.DotNet.PackageTesting" Version="7.0.0-beta.21559.3">
       <Uri>https://github.com/dotnet/arcade</Uri>

eng/Versions.props

@@ -154,8 +154,8 @@
     <!-- Testing -->
     <MicrosoftNETCoreCoreDisToolsVersion>1.0.1-prerelease-00006</MicrosoftNETCoreCoreDisToolsVersion>
     <MicrosoftNETTestSdkVersion>16.9.0-preview-20201201-01</MicrosoftNETTestSdkVersion>
-    <MicrosoftDotNetXHarnessTestRunnersXunitVersion>1.0.0-prerelease.21572.1</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
-    <MicrosoftDotNetXHarnessCLIVersion>1.0.0-prerelease.21572.1</MicrosoftDotNetXHarnessCLIVersion>
+    <MicrosoftDotNetXHarnessTestRunnersXunitVersion>1.0.0-prerelease.21572.4</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
+    <MicrosoftDotNetXHarnessCLIVersion>1.0.0-prerelease.21572.4</MicrosoftDotNetXHarnessCLIVersion>
     <MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>1.0.2-alpha.0.21558.2</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
     <XUnitVersion>2.4.2-pre.9</XUnitVersion>
     <XUnitRunnerVisualStudioVersion>2.4.2</XUnitRunnerVisualStudioVersion>

src/mono/wasm/test-main.js

@@ -257,23 +257,21 @@ function set_exit_code(exit_code, reason) {
         tests_done_elem.innerHTML = exit_code.toString();
         document.body.appendChild(tests_done_elem);
 
-        // need to flush streams (stdout/stderr)
-        for (const stream of Module.FS.streams) {
-            if (stream && stream.stream_ops && stream.stream_ops.flush) {
-                stream.stream_ops.flush(stream);
-            }
-        }
-        console.log("Flushed stdout!");
-
         console.log('1 ' + messsage);
+        originalConsole.log('2 ' + messsage);
         console.log("1 consoleWebSocket.bufferedAmount: " + consoleWebSocket.bufferedAmount);
-        setTimeout(() => {
-            originalConsole.log('2 ' + messsage);
-            console.log("2 consoleWebSocket.bufferedAmount: " + consoleWebSocket.bufferedAmount);
+        const stop_when_ws_buffer_empty = () => {
+            if (consoleWebSocket.bufferedAmount == 0) {
+                // tell xharness WasmTestMessagesProcessor we are done. 
+                // note this sends last we bytes into the same WS
+                console.log("WASM EXIT " + exit_code);
+            }
+            else {
+                setTimeout(stop_when_ws_buffer_empty, 100);
+            }
+        };
+        stop_when_ws_buffer_empty();
 
-            // tell xharness WasmTestMessagesProcessor we are done. 
-            console.log("WASM EXIT " + exit_code);
-        }, 100);
     } else if (INTERNAL) {
         INTERNAL.mono_wasm_exit(exit_code);
     }