Skip to content

Commit 7b2a99f

Browse files
Disable cpp test when on hardware
1 parent a44893f commit 7b2a99f

3 files changed

Lines changed: 16 additions & 2 deletions

File tree

tests/runHardwareTests.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,8 @@ async function main() {
5656
registers: {
5757
...TestConfiguration.TEST_CONFIGURATIONS["armSim2"]!.registers,
5858
},
59-
dataBreakpointsAreUnreliable: true
59+
dataBreakpointsAreUnreliable: true,
60+
isHardwareTest: false,
6061
};
6162
if (cspyArgs.includes("--fpu=None")) {
6263
config.registers.fpuRegisters = undefined;

tests/suites/dbg/variables.test.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,12 @@ debugAdapterSuite("Shows and sets variables", (dc, dbgConfig, fibonacciFile) =>
9292
});
9393
// The contents of STL containers in listwindows can be truncated, and need
9494
// to be expanded by us to get the full contents. Make sure this works ok.
95-
test("Supports STL containers", () => {
95+
test("Supports STL containers", function() {
96+
if (TestConfiguration.getConfiguration().isHardwareTest) {
97+
// The hardware tests do not compile cpp files at the moment
98+
this.skip();
99+
return;
100+
}
96101
return Promise.all([
97102
dc().configurationSequence(),
98103
dc().launch(dbgConfig()),

tests/suites/testConfiguration.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,10 @@ export interface TestConfiguration {
6868
* Whether to run only a small set of tests to verify the most basic functionality.
6969
*/
7070
smokeTestsOnly?: boolean,
71+
/**
72+
* Whether the tests are running in the hardware test rig.
73+
*/
74+
isHardwareTest: boolean;
7175
}
7276

7377
export namespace TestConfiguration {
@@ -159,6 +163,7 @@ export namespace TestConfiguration {
159163
},
160164
},
161165
dataBreakpointsAreUnreliable: false,
166+
isHardwareTest: false,
162167
},
163168
armImperas: {
164169
debugConfiguration: {
@@ -192,6 +197,7 @@ export namespace TestConfiguration {
192197
},
193198
},
194199
dataBreakpointsAreUnreliable: false,
200+
isHardwareTest: false,
195201
},
196202
riscvSim: {
197203
debugConfiguration: {
@@ -228,6 +234,7 @@ export namespace TestConfiguration {
228234
},
229235
},
230236
dataBreakpointsAreUnreliable: false,
237+
isHardwareTest: false,
231238
},
232239
rh850Sim: {
233240
debugConfiguration: {
@@ -269,6 +276,7 @@ export namespace TestConfiguration {
269276
},
270277
},
271278
dataBreakpointsAreUnreliable: false,
279+
isHardwareTest: false,
272280
},
273281
};
274282
}

0 commit comments

Comments
 (0)