Updating tests for new infrastructure

Author: Omar Elkhouly <omar.elkhouly@arm.com>

Author: omarArm

src/integration-tests/config.spec.ts

@@ -51,6 +51,9 @@ describe('config', function () {
     }
 
     it('can specify program via --config=', async function () {
+        if (isRemoteTest) {
+            this.skip();
+        }
         const config = { program: emptyProgram };
         await verifyLaunchWorks(
             this,

src/integration-tests/launch.spec.ts

@@ -151,7 +151,22 @@ describe('launch', function () {
     });
 
     it('works with a space in file names', async function () {
-        await dc.hitBreakpoint(
+        if (isRemoteTest) {
+            await dc.hitBreakpoint(
+            fillDefaults(this.test, {
+                program: emptySpaceProgram,
+                target: {
+                    port: 2333,
+                    serverParameters: [':2333', emptySpaceProgram]
+                }
+            } as unknown as TargetLaunchRequestArguments),
+            {
+                path: emptySpaceSrc,
+                line: 3,
+            }
+        );
+        } else {
+            await dc.hitBreakpoint(
             fillDefaults(this.test, {
                 program: emptySpaceProgram,
             } as LaunchRequestArguments),
@@ -160,6 +175,7 @@ describe('launch', function () {
                 line: 3,
             }
         );
+        }
     });
 
     it('works with unicode in file names', async function () {

src/integration-tests/launchWithEnvironment.spec.ts

@@ -72,7 +72,6 @@ describe('launch with environment', function () {
                 fillDefaults(test, {
                     program: path.join(testProgramsDir, 'vars_env'),
                     environment: environment,
-                    type: 'remote',
                     target: {
                         environment: targetEnvironment,
                         port: 2333,

src/integration-tests/stopGDBServer.spec.ts

@@ -14,7 +14,7 @@ import {
     TargetLaunchArguments,
 } from '../types/session';
 import { CdtDebugClient } from './debugClient';
-import { fillDefaults, standardBeforeEach, testProgramsDir } from './utils';
+import { fillDefaults, isRemoteTest, standardBeforeEach, testProgramsDir } from './utils';
 
 describe('stop gdbserver', function () {
     let dc: CdtDebugClient;
@@ -32,6 +32,9 @@ describe('stop gdbserver', function () {
     });
 
     it('do something', async function () {
+        if (!isRemoteTest) {
+            this.skip();
+        }
         await dc.hitBreakpoint(
             fillDefaults(this.test, {
                 program: emptyProgram,

src/integration-tests/terminated.spec.ts

@@ -10,11 +10,12 @@
 
 // import { expect } from 'chai';
 import * as path from 'path';
-import { LaunchRequestArguments } from '../types/session';
+import { LaunchRequestArguments, TargetLaunchRequestArguments } from '../types/session';
 import { CdtDebugClient } from './debugClient';
 import {
     fillDefaults,
     getScopes,
+    isRemoteTest,
     standardBeforeEach,
     testProgramsDir,
 } from './utils';
@@ -33,7 +34,22 @@ describe('terminated', function () {
     });
 
     it('terminated event arrives after continuing after a breakpoint', async function () {
-        await dc.hitBreakpoint(
+        if (isRemoteTest) {
+            await dc.hitBreakpoint(
+            fillDefaults(this.test, {
+                program: emptyProgram,
+                target: {
+                    port: 2333,
+                    serverParameters: [':2333', emptyProgram]
+                }
+            } as unknown as TargetLaunchRequestArguments),
+            {
+                path: emptySrc,
+                line: 3,
+            }
+        );
+        } else {
+            await dc.hitBreakpoint(
             fillDefaults(this.test, {
                 program: emptyProgram,
             } as LaunchRequestArguments),
@@ -42,6 +58,7 @@ describe('terminated', function () {
                 line: 3,
             }
         );
+        }
 
         await Promise.all([
             dc.waitForEvent('terminated'),