From 06273ad9fb7471076858e81d742805478c0096fc Mon Sep 17 00:00:00 2001
From: Jonah Graham <jonah@kichwacoders.com>
Date: Tue, 20 Mar 2018 09:26:14 +0000
Subject: [PATCH] Bug 532592: [tests] use disassembly mode supported on GDB >=
 7.5

Previous code was only supported on GDB >= 8.0 with /s was introduced
to disassemble command.

Change-Id: Ic82b43c13e0567972d0a032325b12df4786a7ce3
---
 .../cdt/tests/dsf/gdb/tests/GDBRemoteTracepointsTest.java    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/GDBRemoteTracepointsTest.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/GDBRemoteTracepointsTest.java
index 1bea23bc650..ed6d1b3b799 100644
--- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/GDBRemoteTracepointsTest.java
+++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/GDBRemoteTracepointsTest.java
@@ -706,12 +706,15 @@ public class GDBRemoteTracepointsTest extends BaseParametrizedTestCase {
 		// on an instruction < 4 bytes long. We can use that to verify how big
 		// each instruction is.
 
+		// The disassembly does not give the required information on older GDBs.
+		assumeGdbVersionAtLeast(ITestConstants.SUFFIX_GDB_7_5);
+
 		IContainerDMContext containerDmc = SyncUtil.getContainerContext();
 		Query<MIInfo> query = new Query<MIInfo>() {
 			@Override
 			protected void execute(DataRequestMonitor<MIInfo> rm) {
 				fGdbControl.queueCommand(
-						fCommandFactory.createMIInterpreterExecConsole(containerDmc, "disassemble /rs foo"), rm);
+						fCommandFactory.createMIInterpreterExecConsole(containerDmc, "disassemble /rm foo"), rm);
 			}
 		};
 		fGdbControl.getExecutor().execute(query);