diff options
| author | Jonah Graham | 2019-12-19 21:43:10 +0000 |
|---|---|---|
| committer | Jonah Graham | 2019-12-20 01:03:11 +0000 |
| commit | 995bf9320ca59d793522e4a0ab6ccdc990078f42 (patch) | |
| tree | f0ab970b1eab177d91fb13c97565f9119d811d73 /dsf-gdb/org.eclipse.cdt.dsf.gdb | |
| parent | 9a03a7c9d46266c8636c1a24daeb82001298466b (diff) | |
| download | org.eclipse.cdt-995bf9320ca59d793522e4a0ab6ccdc990078f42.tar.gz org.eclipse.cdt-995bf9320ca59d793522e4a0ab6ccdc990078f42.tar.xz org.eclipse.cdt-995bf9320ca59d793522e4a0ab6ccdc990078f42.zip | |
Bug 558488: Fix GDB version number comparisons for GDB 10 and above
The previous code would treat GDB 10.0 as earlier than 6.8
Change-Id: Ie95d9459462636c9ae0713c65686eec64cb553fa
Diffstat (limited to 'dsf-gdb/org.eclipse.cdt.dsf.gdb')
| -rw-r--r-- | dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/GdbLaunchDelegate.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/GdbLaunchDelegate.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/GdbLaunchDelegate.java index 126baca1386..9f16f8aae23 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/GdbLaunchDelegate.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/GdbLaunchDelegate.java @@ -156,7 +156,7 @@ public class GdbLaunchDelegate extends AbstractCLaunchDelegate2 { if (LaunchUtils.getIsPostMortemTracing(config) && !isPostMortemTracingSupportedInGdbVersion(gdbVersion)) { throw new DebugException(new Status(IStatus.ERROR, GdbPlugin.PLUGIN_ID, DebugException.REQUEST_FAILED, - "Post-mortem tracing is not supported for GDB " + gdbVersion + ", GDB " + NON_STOP_FIRST_VERSION //$NON-NLS-1$//$NON-NLS-2$ + "Post-mortem tracing is not supported for GDB " + gdbVersion + ", GDB " + TRACING_FIRST_VERSION //$NON-NLS-1$//$NON-NLS-2$ + " or higher is required.", //$NON-NLS-1$ null)); } @@ -465,7 +465,7 @@ public class GdbLaunchDelegate extends AbstractCLaunchDelegate2 { * @since 4.0 */ protected boolean isNonStopSupportedInGdbVersion(String version) { - if (NON_STOP_FIRST_VERSION.compareTo(version) <= 0) {// XXX: 7.2 > 7.11 !!! + if (LaunchUtils.compareVersions(NON_STOP_FIRST_VERSION, version) <= 0) { return true; } return false; @@ -477,7 +477,7 @@ public class GdbLaunchDelegate extends AbstractCLaunchDelegate2 { * @since 4.0 */ protected boolean isPostMortemTracingSupportedInGdbVersion(String version) { - if (TRACING_FIRST_VERSION.compareTo(version) <= 0 + if (LaunchUtils.compareVersions(TRACING_FIRST_VERSION, version) <= 0 // This feature will be available for GDB 7.2. But until that GDB is itself available // there is a pre-release that has a version of 6.8.50.20090414 || "6.8.50.20090414".equals(version)) { //$NON-NLS-1$ |