updating test debug client to support memory events and memory references

Author: omarArm

src/gdb/GDBDebugSessionBase.ts

@@ -2671,11 +2671,19 @@ export abstract class GDBDebugSessionBase extends LoggingDebugSession {
                             })
                         ).value
                       : varobj.value;
+                const variablesReference =
+                    parseInt(varobj.numchild, 10) > 0
+                        ? this.variableHandles.create({
+                              type: 'object',
+                              frameHandle,
+                              varobjName: varobj.varname,
+                          })
+                        : 0;
+                let memoryReferenceResult:
+                    | MIGDBDataEvaluateExpressionResponse
+                    | undefined;
+                let hasMemoryReference = false;
                 if (this.supportsMemoryReferences) {
-                    let memoryReferenceResult:
-                        | MIGDBDataEvaluateExpressionResponse
-                        | undefined;
-                    let hasMemoryReference = false;
                     try {
                         memoryReferenceResult =
                             await mi.sendDataEvaluateExpression(
@@ -2691,36 +2699,15 @@ export abstract class GDBDebugSessionBase extends LoggingDebugSession {
                     } catch (err) {
                         hasMemoryReference = false;
                     }
-                    const variablesReference =
-                        parseInt(varobj.numchild, 10) > 0
-                            ? this.variableHandles.create({
-                                  type: 'object',
-                                  frameHandle,
-                                  varobjName: varobj.varname,
-                              })
-                            : 0;
-                    response.body = {
-                        result,
-                        type: varobj.type,
-                        variablesReference,
-                        memoryReference:
-                            hasMemoryReference && memoryReferenceResult
-                                ? memoryReferenceResult.value
-                                : undefined,
-                    };
                 }
-                const variablesReference =
-                    parseInt(varobj.numchild, 10) > 0
-                        ? this.variableHandles.create({
-                              type: 'object',
-                              frameHandle,
-                              varobjName: varobj.varname,
-                          })
-                        : 0;
                 response.body = {
                     result,
                     type: varobj.type,
                     variablesReference,
+                    memoryReference:
+                        hasMemoryReference && memoryReferenceResult
+                            ? memoryReferenceResult.value
+                            : undefined,
                 };
             }
 

src/integration-tests/debugClient.ts

@@ -141,6 +141,8 @@ export class CdtDebugClient extends DebugClient {
         if (!args) {
             args = {
                 supportsRunInTerminalRequest: true,
+                supportsMemoryEvent: true,
+                supportsMemoryReferences: true,
                 adapterID: this['_debugType'],
                 linesStartAt1: true,
                 columnsStartAt1: true,

src/integration-tests/evaluate.spec.ts

@@ -539,10 +539,10 @@ describe('evaluate request global variables', function () {
             expression: 'global_int',
             frameId: scope.frame.id,
         });
-        expect(watchRes.body.memoryReference).to.be.a('string');
+        expect(watchRes.body.memoryReference).to.not.be.undefined;
     });
 
-    it('response for variables should include memory reference if the expression does not have an lvalue', async function () {
+    it('should not include memory reference if the expression does not have an lvalue', async function () {
         const watchRes = await dc.evaluateRequest({
             context: 'watch',
             expression: 'global_int + 1',