More test.xml removal.

7 files changed, 2 insertions, 242 deletions

diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/build.properties b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/build.properties
index 118522991a..969e22ba7f 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/build.properties
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/build.properties
@@ -5,6 +5,5 @@ bin.includes = META-INF/,\
                plugin.properties,\
                resources/,\
                about.html,\
-               valgrindFiles/,\
-               test.xml
+               valgrindFiles/
 
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/test.xml b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/test.xml
deleted file mode 100644
index a431252ffe..0000000000
--- a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/test.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="testsuite" default="run" basedir=".">
-	<property name="cachegrind_classname" value="org.eclipse.linuxtools.internal.valgrind.cachegrind.tests.AllTests" />
-	<property name="cachegrind-plugin-name" value="org.eclipse.linuxtools.valgrind.cachegrind.tests" />
-
-	<property name="library-file" value="${eclipse-home}/dropins/${subProjectName2}/plugins/org.eclipse.test/library.xml" />
-
-	<!-- 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}/../.." />
-
-	<!-- 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="cachegrind_suite">
-		<property name="cachegrind-folder" value="${eclipse-home}/cachegrind_folder" />
-		<delete dir="${cachegrind-folder}" quiet="true" />
-		<ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
-			<property name="data-dir" value="${cachegrind-folder}" />
-			<property name="plugin-name" value="${cachegrind-plugin-name}" />
-			<property name="classname" value="${cachegrind_classname}" />
-		</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">
-		<mkdir dir="${results}/consolelogs" />
-		<copy failonerror="false" file="${eclipse-home}/results/${cachegrind_classname}.txt" tofile="${results}/consolelogs/${cachegrind_classname}_${platform}.metadata.log.txt" />
-	</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,cachegrind_suite,cleanup">
-		<ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
-			<property name="includes" value="org*.xml" />
-			<property name="output-file" value="${cachegrind-plugin-name}.xml" />
-		</ant>
-	</target>
-	
-    <target name="all" depends="run" description="Dummy target to run all tests">
-    </target>
-
-</project>
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/build.properties b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/build.properties
index 118522991a..969e22ba7f 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/build.properties
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/build.properties
@@ -5,6 +5,5 @@ bin.includes = META-INF/,\
                plugin.properties,\
                resources/,\
                about.html,\
-               valgrindFiles/,\
-               test.xml
+               valgrindFiles/
 
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/test.xml b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/test.xml
deleted file mode 100644
index f43672afe3..0000000000
--- a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/test.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="testsuite" default="run" basedir=".">
-	<property name="massif_classname" value="org.eclipse.linuxtools.internal.valgrind.massif.tests.AllTests" />
-	<property name="massif-plugin-name" value="org.eclipse.linuxtools.valgrind.massif.tests" />
-
-	<property name="library-file" value="${eclipse-home}/dropins/${subProjectName2}/plugins/org.eclipse.test/library.xml" />
-
-	<!-- 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}/../.." />
-
-	<!-- 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="massif_suite">
-		<property name="massif-folder" value="${eclipse-home}/massif_folder" />
-		<delete dir="${massif-folder}" quiet="true" />
-		<ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
-			<property name="data-dir" value="${massif-folder}" />
-			<property name="plugin-name" value="${massif-plugin-name}" />
-			<property name="classname" value="${massif_classname}" />
-		</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">
-		<mkdir dir="${results}/consolelogs" />
-		<copy failonerror="false" file="${eclipse-home}/results/${massif_classname}.txt" tofile="${results}/consolelogs/${massif_classname}_${platform}.metadata.log.txt" />
-	</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,massif_suite,cleanup">
-		<ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
-			<property name="includes" value="org*.xml" />
-			<property name="output-file" value="${massif-plugin-name}.xml" />
-		</ant>
-	</target>
-	
-    <target name="all" depends="run" description="Dummy target to run all tests">
-    </target>
-
-</project>
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/build.properties b/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/build.properties
index 9049d46207..d665513ed4 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/build.properties
+++ b/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/build.properties
@@ -3,7 +3,6 @@ output.. = bin/
 bin.includes = META-INF/,\
                .,\
                plugin.properties,\
-               test.xml,\
                resources/,\
                about.html,\
                valgrindFiles/
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/test.xml b/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/test.xml
deleted file mode 100644
index b07e573e8d..0000000000
--- a/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/test.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="testsuite" default="run" basedir=".">
-	<property name="memcheck_classname" value="org.eclipse.linuxtools.internal.valgrind.memcheck.tests.AllTests" />
-	<property name="plugin-name" value="org.eclipse.linuxtools.valgrind.memcheck.tests" />
-
-	<property name="library-file" value="${eclipse-home}/dropins/${subProjectName2}/plugins/org.eclipse.test/library.xml" />
-
-	<!-- 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}/../.." />
-
-	<!-- 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="memcheck_suite">
-		<property name="memcheck-folder" value="${eclipse-home}/memcheck_folder" />
-		<delete dir="${memcheck-folder}" quiet="true" />
-		<ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
-			<property name="data-dir" value="${memcheck-folder}" />
-			<property name="plugin-name" value="${plugin-name}" />
-			<property name="classname" value="${memcheck_classname}" />
-		</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">
-		<mkdir dir="${results}/consolelogs" />
-		<copy failonerror="false" file="${eclipse-home}/results/${memcheck_classname}.txt" tofile="${results}/consolelogs/${memcheck_classname}_${platform}.metadata.log.txt" />
-	</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,memcheck_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="all" depends="run" description="Dummy target to run all tests">
-    </target>
-
-</project>
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.tests/test.xml b/valgrind/org.eclipse.linuxtools.valgrind.tests/test.xml
deleted file mode 100644
index 6f072efeb6..0000000000
--- a/valgrind/org.eclipse.linuxtools.valgrind.tests/test.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="testsuite" default="run" basedir=".">
-	<property name="cachegrindClassname" value="org.eclipse.linuxtools.internal.valgrind.cachegrind.tests.AllTests" />
-	<property name="massifClassname" value="org.eclipse.linuxtools.internal.valgrind.massif.tests.AllTests" />
-	<property name="memcheckClassname" value="org.eclipse.linuxtools.internal.valgrind.memcheck.tests.AllTests" />
-
-	<property name="cachegrind-plugin-name" value="org.eclipse.linuxtools.valgrind.cachegrind.tests" />
-	<property name="massif-plugin-name" value="org.eclipse.linuxtools.valgrind.massif.tests" />
-	<property name="memcheck-plugin-name" value="org.eclipse.linuxtools.valgrind.memcheck.tests" />
-
-	<!-- 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}/../.." />
-	<property name="library-file" value="${eclipse-home}/dropins/eclipse/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>
-
-	<target name="memchecksuite">
-		<property name="memcheck-folder" value="${eclipse-home}/memcheck_folder" />
-		<delete dir="${massif-folder}" quiet="true" />
-		<ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
-			<property name="data-dir" value="${massif-folder}" />
-			<property name="plugin-name" value="${memcheck-plugin-name}" />
-			<property name="classname" value="${memcheckClassname}" />
-		</ant>
-	</target>
-
-	<target name="massifsuite">
-		<property name="massif-folder" value="${eclipse-home}/massif_folder" />
-		<delete dir="${massif-folder}" quiet="true" />
-		<ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
-			<property name="data-dir" value="${massif-folder}" />
-			<property name="plugin-name" value="${massif-plugin-name}" />
-			<property name="classname" value="${massifClassname}" />
-		</ant>
-	</target>
-	
-	<target name="cachegrindsuite">
-			<property name="cachegrind-folder" value="${eclipse-home}/cachegrind_folder" />
-			<delete dir="${cachegrind-folder}" quiet="true" />
-			<ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
-				<property name="data-dir" value="${cachegrind-folder}" />
-				<property name="plugin-name" value="${cachegrind-plugin-name}" />
-				<property name="classname" value="${cachegrindClassname}" />
-			</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">
-		<mkdir dir="${results}/consolelogs" />
-		<copy failonerror="false" file="${eclipse-home}/results/${classname}.txt" tofile="${results}/consolelogs/${classname}_${platform}.metadata.log.txt" />
-	</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,memchecksuite,massifsuite,cachegrindsuite,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>