From 8698d6ce9b4d53c640f796825a378b766b4081ba Mon Sep 17 00:00:00 2001
From: Jonah Graham <jonah@kichwacoders.com>
Date: Mon, 4 Jan 2021 21:47:32 -0500
Subject: [PATCH] Bug 570018: Run tests with the conflicting gdbjtag launch
 config

Change-Id: I4a84b8da30074656cf6678de682af2725bde1f59
---
 jtag/org.eclipse.cdt.debug.gdbjtag.core.tests/pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.core.tests/pom.xml b/jtag/org.eclipse.cdt.debug.gdbjtag.core.tests/pom.xml
index 368b1fa34d5..aa78ea437c2 100644
--- a/jtag/org.eclipse.cdt.debug.gdbjtag.core.tests/pom.xml
+++ b/jtag/org.eclipse.cdt.debug.gdbjtag.core.tests/pom.xml
@@ -76,6 +76,12 @@
 								<id>org.eclipse.cdt</id>
 								<versionRange>0.0.0</versionRange>
 							</requirement>
+							<requirement>
+								<!-- Include the DAP bundle to test for any conflicts with it as both may be present in a user install. -->
+								<type>p2-installable-unit</type>
+								<id>org.eclipse.cdt.debug.dap.gdbjtag</id>
+								<versionRange>0.0.0</versionRange>
+							</requirement>
 						</extraRequirements>
 					</dependency-resolution>
 				</configuration>