bug 303456 - execute discovery tests as part of platform builds

2 files changed, 65 insertions, 1 deletions

diff --git a/bundles/org.eclipse.equinox.p2.tests.discovery/build.properties b/bundles/org.eclipse.equinox.p2.tests.discovery/build.properties
index 16fc97f5d..23b466377 100644
--- a/bundles/org.eclipse.equinox.p2.tests.discovery/build.properties
+++ b/bundles/org.eclipse.equinox.p2.tests.discovery/build.properties
@@ -15,5 +15,6 @@ bin.includes = META-INF/,\
                about.html,\
                plugin.xml,\
                plugin.properties,\
-               testdata/
+               testdata/,\
+               test.xml
 
diff --git a/bundles/org.eclipse.equinox.p2.tests.discovery/test.xml b/bundles/org.eclipse.equinox.p2.tests.discovery/test.xml
new file mode 100644
index 000000000..bc26f5862
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.tests.discovery/test.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0"?>
+<project name="p2 Automated Tests" default="run" basedir=".">
+
+	<!-- The property ${eclipse-home} should be passed into this script -->
+	<!-- sets the properties eclipse-home, and library-file -->
+	<property name="eclipse-home" value="${basedir}/../../" />
+	<property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test/library.xml" />
+	<property name="p2discovery_location" value="${eclipse-home}/p2_discovery_data_dir" />
+	<property name="plugin-name" value="org.eclipse.equinox.p2.tests.discovery" />
+
+	<!-- 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 />
+	</target>
+
+	<!-- This target holds code to cleanup the testing environment after the tests -->
+	<!-- have been run. You can use this to delete temporary files that are created. -->
+	<target name="cleanup">
+		<delete dir="${p2discovery_location}" quiet="true" />
+	</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>
+
+	<!-- This target runs the performance test suites. Any actions that need to happen after all -->
+	<!-- the tests have been run should go here. -->
+	<!--
+	<target name="performance" depends="init,performance-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>
+	-->
+	
+	<target name="p2Tests" depends="init,cleanup">
+		<ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
+			<property name="data-dir" value="${p2discovery_location}" />
+			<property name="plugin-name" value="org.eclipse.equinox.p2.tests.discovery" />
+			<property name="classname" value="org.eclipse.equinox.p2.tests.discovery.AllDiscoveryTests" />
+		</ant>
+	</target>
+
+	<!-- This target defines the tests that need to be run. -->
+	<target name="suite" depends="p2Tests" />
+
+	<!-- This target defines the performance tests that need to be run. -->
+	<!--
+	<target name="performance-suite" depends="p2PerformanceTests" />
+	-->
+
+	<target name="p2PerformanceTests">
+		<!-- TODO -->
+	</target>
+</project>