Remove automatic insertion of --port server (#695)

Refers to server parameter argument, based on target.port

Signed-off-by: Jens Reinecke <jens.reinecke@arm.com>

Author: jreineckearm

src/debug-configuration/subproviders/pyocd-configuration-provider.test.ts

@@ -34,7 +34,7 @@ describe('PyocdConfigurationProvider', () => {
             expect(gdbtargetConfig?.target?.serverParameters).not.toContain('--port');
         });
 
-        it('adds port to server parameters, gdbserver always gets added', async () => {
+        it('always adds gdbserver, does not add port to server parameters', async () => {
             const configProvider = new PyocdConfigurationProvider();
             const config = gdbTargetConfiguration({
                 target: targetConfigurationFactory({ port: '4711' }),
@@ -43,16 +43,16 @@ describe('PyocdConfigurationProvider', () => {
             expect(debugConfig).toBeDefined();
             const gdbtargetConfig = debugConfig as GDBTargetConfiguration;
             expect(gdbtargetConfig?.target?.serverParameters).toContain('gdbserver');
-            expect(gdbtargetConfig?.target?.serverParameters).toContain('--port');
-            expect(gdbtargetConfig?.target?.serverParameters).toContain('4711');
+            // GDB port expected to come through *.cbuild-run.yml file.
+            expect(gdbtargetConfig?.target?.serverParameters).not.toContain('--port');
         });
 
-        it('does not overwrite port in server parameters', async () => {
+        it('keeps port from config in server parameters', async () => {
             const configProvider = new PyocdConfigurationProvider();
             const config = gdbTargetConfiguration({
                 target: targetConfigurationFactory({
                     port: '4711',
-                    serverParameters: ['-port', '10815'],
+                    serverParameters: ['--port', '10815'],
                 }),
             });
             const debugConfig = await configProvider.resolveDebugConfigurationWithSubstitutedVariables(undefined, config, undefined);

src/debug-configuration/subproviders/pyocd-configuration-provider.ts

@@ -27,7 +27,6 @@ const PYOCD_EXECUTABLE_ONLY_REGEXP = /^\s*pyocd(|.exe)\s*$/i;
 export const PYOCD_SERVER_TYPE_REGEXP = /.*pyocd(|.exe)\s*$/i;
 
 const PYOCD_CLI_ARG_GDBSERVER = 'gdbserver';
-const PYOCD_CLI_ARG_PORT = '--port';
 const PYOCD_CLI_ARG_CBUILDRUN = '--cbuild-run';
 
 export class PyocdConfigurationProvider extends BaseConfigurationProvider {
@@ -57,11 +56,6 @@ export class PyocdConfigurationProvider extends BaseConfigurationProvider {
             // Prepend, it must be the first argument
             parameters.unshift(PYOCD_CLI_ARG_GDBSERVER);
         }
-        // port (use value defined in 'port' outside 'serverParamters')
-        const port = debugConfiguration.target?.port;
-        if (port && await this.shouldAppendParameter(parameters, PYOCD_CLI_ARG_PORT)) {
-            parameters.push(PYOCD_CLI_ARG_PORT, `${port}`);
-        }
         // cbuild-run
         const cbuildRunFile = debugConfiguration.cmsis?.cbuildRunFile;
         if (cbuildRunFile && await this.shouldAppendParameter(parameters, PYOCD_CLI_ARG_CBUILDRUN)) {