diff options
Diffstat (limited to 'jtag/org.eclipse.cdt.debug.gdbjtag.core.tests/pom.xml')
| -rw-r--r-- | jtag/org.eclipse.cdt.debug.gdbjtag.core.tests/pom.xml | 36 |
1 files changed, 23 insertions, 13 deletions
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 36ff04971a3..cb343510332 100644 --- a/jtag/org.eclipse.cdt.debug.gdbjtag.core.tests/pom.xml +++ b/jtag/org.eclipse.cdt.debug.gdbjtag.core.tests/pom.xml @@ -1,4 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + Copyright (c) 2018, 2021 Contributors to the Eclipse Foundation + + This program and the accompanying materials + are made available under the terms of the Eclipse Public License 2.0 + which accompanies this distribution, and is available at + https://www.eclipse.org/legal/epl-2.0/ + + SPDX-License-Identifier: EPL-2.0 +--> <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> @@ -7,16 +17,15 @@ <parent> <groupId>org.eclipse.cdt</groupId> <artifactId>cdt-parent</artifactId> - <version>9.9.0-SNAPSHOT</version> + <version>10.7.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.400-SNAPSHOT</version> <artifactId>org.eclipse.cdt.debug.gdbjtag.core.tests</artifactId> <packaging>eclipse-test-plugin</packaging> <properties> - <dsf.gdb.tests.gdbTestSuite>AutomatedSuite.java</dsf.gdb.tests.gdbTestSuite> <dsf.gdb.tests.timeout.multiplier>1</dsf.gdb.tests.timeout.multiplier> <skipTests>${dsf-gdb.skip.tests}</skipTests> </properties> @@ -24,15 +33,14 @@ <plugins> <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.8</version> <executions> <execution> <id>clean</id> <phase>clean</phase> <configuration> - <tasks> + <target> <ant antfile="../../dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/TestAppBuilder.xml" target="clean"/> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -42,9 +50,9 @@ <id>prepare</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <ant antfile="../../dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/TestAppBuilder.xml" target="makeTestApps"/> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -59,11 +67,7 @@ <configuration> <useUIHarness>false</useUIHarness> <argLine>${tycho.testArgLine} ${base.ui.test.vmargs} -ea -Xms256m -Xmx512m -Dcdt.tests.dsf.gdb.path=${dsf.gdb.tests.gdbPath} -Ddsf.gdb.tests.timeout.multiplier=${dsf.gdb.tests.timeout.multiplier} -Dcdt.tests.dsf.gdb.versions=${cdt.tests.dsf.gdb.versions}</argLine> - <appArgLine>-debug ./dsf.debug.options</appArgLine> - <includes> - <include>**/${dsf.gdb.tests.gdbTestSuite}</include> - </includes> - <testFailureIgnore>true</testFailureIgnore> + <appArgLine>-debug ./dsf.debug.options -pluginCustomization ${basedir}/../../disable_intro_in_tests.ini</appArgLine> </configuration> </plugin> <plugin> @@ -82,6 +86,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> |