Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2018-01-07 08:34:44 -0500
committerEike Stepper2018-01-07 08:34:44 -0500
commit273adb8832a5f090ff65aa66d4896501fdd3e9d5 (patch)
tree4c21529498d720a9abed8cae7a3ffd7b834a36e6
parentd94f991980a5c85758cf426100ead7390a4ae8d7 (diff)
downloadcdo-273adb8832a5f090ff65aa66d4896501fdd3e9d5.tar.gz
cdo-273adb8832a5f090ff65aa66d4896501fdd3e9d5.tar.xz
cdo-273adb8832a5f090ff65aa66d4896501fdd3e9d5.zip
[528979] Migrate build to Maven/Tycho
https://bugs.eclipse.org/bugs/show_bug.cgi?id=528979
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.db/pom.xml45
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/build.properties1
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/pom.xml2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/IntegrationTestsLegacy.java31
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/test.xml47
-rw-r--r--releng/org.eclipse.emf.cdo.releng.parent/plugins/pom.xml42
6 files changed, 74 insertions, 94 deletions
diff --git a/plugins/org.eclipse.emf.cdo.tests.db/pom.xml b/plugins/org.eclipse.emf.cdo.tests.db/pom.xml
index 3f96893e07..702a4ef68d 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db/pom.xml
+++ b/plugins/org.eclipse.emf.cdo.tests.db/pom.xml
@@ -28,49 +28,4 @@
<version>4.0.700-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
- <profiles>
- <profile>
- <id>cdo-tests</id>
- <activation>
- <property>
- <name>CDO_TESTS</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-surefire-plugin</artifactId>
- <configuration>
- <test>${CDO_TESTS}*</test>
- <testFailureIgnore>true</testFailureIgnore>
- <systemProperties>
- <disable.main.suite.finished>true</disable.main.suite.finished>
- </systemProperties>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>no-cdo-tests</id>
- <activation>
- <property>
- <name>!CDO_TESTS</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-surefire-plugin</artifactId>
- <configuration>
- <skipTests>true</skipTests>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
</project>
diff --git a/plugins/org.eclipse.emf.cdo.tests/build.properties b/plugins/org.eclipse.emf.cdo.tests/build.properties
index 9effe6571f..7614d1693e 100644
--- a/plugins/org.eclipse.emf.cdo.tests/build.properties
+++ b/plugins/org.eclipse.emf.cdo.tests/build.properties
@@ -21,7 +21,6 @@ bin.includes = .,\
model1.ecore,\
modeling32.png,\
model2.ecore,\
- test.xml,\
uml2/,\
My.ecore,\
.options,\
diff --git a/plugins/org.eclipse.emf.cdo.tests/pom.xml b/plugins/org.eclipse.emf.cdo.tests/pom.xml
index 64332e6185..e14209c340 100644
--- a/plugins/org.eclipse.emf.cdo.tests/pom.xml
+++ b/plugins/org.eclipse.emf.cdo.tests/pom.xml
@@ -26,6 +26,6 @@
<groupId>org.eclipse.emf.cdo</groupId>
<artifactId>org.eclipse.emf.cdo.tests</artifactId>
<version>4.0.700-SNAPSHOT</version>
- <packaging>eclipse-plugin</packaging>
+ <packaging>eclipse-test-plugin</packaging>
</project>
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/IntegrationTestsLegacy.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/IntegrationTestsLegacy.java
new file mode 100644
index 0000000000..f129c126c5
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/IntegrationTestsLegacy.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2018 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
+ */
+package org.eclipse.emf.cdo.tests;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+/**
+ * @author Eike Stepper
+ */
+public class IntegrationTestsLegacy extends AllConfigs
+{
+ public static Test suite()
+ {
+ return new IntegrationTestsLegacy().getTestSuite();
+ }
+
+ @Override
+ protected void initConfigSuites(TestSuite parent)
+ {
+ addScenario(parent, MEM_BRANCHES, JVM, LEGACY);
+ }
+}
diff --git a/plugins/org.eclipse.emf.cdo.tests/test.xml b/plugins/org.eclipse.emf.cdo.tests/test.xml
deleted file mode 100644
index 43b07a3b25..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests/test.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="testsuite" default="run" basedir=".">
- <!-- The property ${eclipse-home} should be passed into this script -->
- <!-- Set a meaningful default value for when it is not. -->
- <property name="eclipse-home" value="${basedir}\..\.."/>
-
- <!-- sets the properties plugin-name, and library-file -->
- <property name="plugin-name" value="org.eclipse.emf.cdo.tests"/>
- <property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test/library.xml"/>
-
- <!-- This target holds all initialization code that needs to be done for -->
- <!-- all tests that are to be run. Initialization for individual tests -->
- <!-- should be done within the body of the suite target. -->
- <target name="init">
- <tstamp/>
- <delete>
- <fileset dir="${eclipse-home}" includes="org*.xml"/>
- </delete>
- </target>
-
- <!-- This target defines the tests that need to be run. -->
- <target name="suite">
- <property name="emf-folder" value="${eclipse-home}/emf_folder"/>
- <delete dir="${emf-folder}" quiet="true"/>
- <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
- <property name="data-dir" value="${emf-folder}"/>
- <property name="plugin-name" value="${plugin-name}"/>
- <property name="classname" value="org.eclipse.emf.cdo.tests.AllTests"/>
- </ant>
- </target>
-
- <!-- This target holds code to cleanup the testing environment after -->
- <!-- after all of the tests have been run. You can use this target to -->
- <!-- delete temporary files that have been created. -->
- <target name="cleanup">
- </target>
-
- <!-- This target runs the test suite. Any actions that need to happen -->
- <!-- after all the tests have been run should go here. -->
- <target name="run" depends="init,suite,cleanup">
- <ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
- <property name="includes" value="org*.xml"/>
- <property name="output-file" value="${plugin-name}.xml"/>
- </ant>
- </target>
-</project> \ No newline at end of file
diff --git a/releng/org.eclipse.emf.cdo.releng.parent/plugins/pom.xml b/releng/org.eclipse.emf.cdo.releng.parent/plugins/pom.xml
index 849cbf29c6..a0f6735d8d 100644
--- a/releng/org.eclipse.emf.cdo.releng.parent/plugins/pom.xml
+++ b/releng/org.eclipse.emf.cdo.releng.parent/plugins/pom.xml
@@ -240,6 +240,48 @@ Eike Stepper - initial API and implementation
</plugins>
</build>
</profile>
+ <profile>
+ <id>cdo-tests</id>
+ <activation>
+ <property>
+ <name>CDO_TESTS</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-surefire-plugin</artifactId>
+ <configuration>
+ <test>${CDO_TESTS}*</test>
+ <testFailureIgnore>true</testFailureIgnore>
+ <systemProperties>
+ <disable.main.suite.finished>true</disable.main.suite.finished>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>no-cdo-tests</id>
+ <activation>
+ <property>
+ <name>!CDO_TESTS</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-surefire-plugin</artifactId>
+ <configuration>
+ <skipTests>true</skipTests>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>

Back to the top