Fix bug with parsing UART output (eclipse-cdt-cloud#318)

jonahgraham · Nov 21, 2023 · 59af421 · 59af421
1 parent 89cdd9c
commit 59af421
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/src/GDBTargetDebugSession.ts b/src/GDBTargetDebugSession.ts
@@ -391,15 +391,12 @@ export class GDBTargetDebugSession extends GDBDebugSession {
             this.socket = new Socket();
             this.socket.setEncoding('utf-8');
 
-            const eolChar: string =
-                uart.eolCharacter === 'CRLF' ? '\r\n' : '\n';
-
             let tcpUartData = '';
             this.socket.on('data', (data: string) => {
                 for (const char of data) {
-                    if (char === eolChar) {
+                    if (char === '\n') {
                         this.sendEvent(
-                            new OutputEvent(tcpUartData + os.EOL, 'Socket')
+                            new OutputEvent(tcpUartData + '\n', 'Socket')
                         );
                         tcpUartData = '';
                     } else {

diff --git a/src/integration-tests/test-programs/socketServer.js b/src/integration-tests/test-programs/socketServer.js
@@ -1,5 +1,6 @@
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const net = require('net');
+const os = require('os');
 
 // Create socket echo server.
 const socketServer = new net.Server();
@@ -12,7 +13,7 @@ socketServer.on('connection', (connection) => {
     });
 
     // Echo "Hello World!"
-    connection.write('Hello World!\n');
+    connection.write(`Hello World!${os.EOL}`);
 });
 
 socketServer.on('close', () => {