test_runner: dont split lines on test:stdout

PR-URL: #48057
Backport-PR-URL: #48684
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>

Author: MoLow

lib/internal/test_runner/reporter/spec.js

@@ -119,7 +119,7 @@ class SpecReporter extends Transform {
 break;
 case'test:stderr':
 case'test:stdout':
-return`${data.message}\n`;
+returndata.message;
 case'test:diagnostic':
 return`${colors[type]}${this.#indent(data.nesting)}${symbols[type]}${data.message}${white}\n`;
 case'test:coverage':

lib/internal/test_runner/reporter/tap.js

@@ -5,10 +5,10 @@ const {
  ArrayPrototypePush,
  ObjectEntries,
  RegExpPrototypeSymbolReplace,
+ RegExpPrototypeSymbolSplit,
  SafeMap,
  SafeSet,
  StringPrototypeReplaceAll,
- StringPrototypeSplit,
  StringPrototypeRepeat,
 }=primordials;
 const{ inspectWithNoCustomRetry }=require('internal/errors');
@@ -46,8 +46,14 @@ async function * tapReporter(source) {
 yield`${indent(data.nesting)}# Subtest: ${tapEscape(data.name)}\n`;
 break;
 case'test:stderr':
-case'test:stdout':
-case'test:diagnostic':
+case'test:stdout': {
+constlines=RegExpPrototypeSymbolSplit(kLineBreakRegExp,data.message);
+for(leti=0;i<lines.length;i++){
+if(lines[i].length===0)continue;
+yield`# ${tapEscape(lines[i])}\n`;
+}
+break;
+}case'test:diagnostic':
 yield`${indent(data.nesting)}# ${tapEscape(data.message)}\n`;
 break;
 case'test:coverage':
@@ -124,7 +130,7 @@ function jsToYaml(indent, name, value, seen) {
 return`${prefix}${inspectWithNoCustomRetry(value,inspectOptions)}\n`;
 }
 
-constlines=StringPrototypeSplit(value,kLineBreakRegExp);
+constlines=RegExpPrototypeSymbolSplit(kLineBreakRegExp,value);
 
 if(lines.length===1){
 return`${prefix}${inspectWithNoCustomRetry(value,inspectOptions)}\n`;
@@ -224,7 +230,7 @@ function jsToYaml(indent, name, value, seen) {
 constframes=[];
 
 ArrayPrototypeForEach(
-StringPrototypeSplit(errStack,kLineBreakRegExp),
+RegExpPrototypeSymbolSplit(kLineBreakRegExp,errStack),
 (frame)=>{
 constprocessed=RegExpPrototypeSymbolReplace(
 kFrameStartRegExp,

lib/internal/test_runner/runner.js

@@ -11,14 +11,12 @@ const {
  ArrayPrototypeSlice,
  ArrayPrototypeSome,
  ArrayPrototypeSort,
- hardenRegExp,
  ObjectAssign,
  PromisePrototypeThen,
  SafePromiseAll,
  SafePromiseAllReturnVoid,
  SafePromiseAllSettledReturnVoid,
  PromiseResolve,
- RegExpPrototypeSymbolSplit,
  SafeMap,
  SafeSet,
  StringPrototypeIndexOf,
@@ -74,7 +72,6 @@ const {
 constkFilterArgs=['--test','--experimental-test-coverage','--watch'];
 constkFilterArgValues=['--test-reporter','--test-reporter-destination'];
 constkDiagnosticsFilterArgs=['tests','suites','pass','fail','cancelled','skipped','todo','duration_ms'];
-constkSplitLine=hardenRegExp(/\r?\n/);
 
 constkCanceledTests=newSafeSet()
 .add(kCancelledByParent).add(kAborted).add(kTestTimeoutFailure);
@@ -300,15 +297,11 @@ class FileTest extends Test {
 }
 
 if(TypedArrayPrototypeGetLength(nonSerialized)>0){
-constmessages=RegExpPrototypeSymbolSplit(kSplitLine,nonSerialized.toString('utf-8'));
-for(leti=0;i<messages.length;i++){
-constmessage=messages[i];
-this.addToReport({
-__proto__: null,
-type: 'test:stdout',
-data: {__proto__: null,file: this.name, message },
-});
-}
+this.addToReport({
+__proto__: null,
+type: 'test:stdout',
+data: {__proto__: null,file: this.name,message: nonSerialized.toString('utf-8')},
+});
 }
 
 while(bufferHead?.length>=kSerializedSizeHeader){
@@ -385,7 +378,7 @@ function runTestFile(path, root, inspectPort, filesWatcher, testNamePatterns) {
 subtest.addToReport({
 __proto__: null,
 type: 'test:stderr',
-data: {__proto__: null,file: path,message: line},
+data: {__proto__: null,file: path,message: line+'\n'},
 });
 });
 

test/fixtures/test-runner/output/arbitrary-output-colored.snapshot

@@ -1,7 +1,5 @@
 { foo: [32m'bar'[39m }
-
 [33m1[39m
-
 [32m✔ passing test [90m(*ms)[39m[39m
 [34mℹ tests 1[39m
 [34mℹ suites 0[39m
@@ -13,9 +11,7 @@
 [34mℹ duration_ms *[39m
 TAP version 13
 # { foo: [32m'bar'[39m }
-# 
 # [33m1[39m
-# 
 # Subtest: passing test
 ok 1 - passing test
  ---