More test.xml removal.

19 files changed, 3 insertions, 768 deletions

diff --git a/changelog/org.eclipse.linuxtools.changelog.tests/build.properties b/changelog/org.eclipse.linuxtools.changelog.tests/build.properties
index d1444fea4e..34d2e4d2da 100644
--- a/changelog/org.eclipse.linuxtools.changelog.tests/build.properties
+++ b/changelog/org.eclipse.linuxtools.changelog.tests/build.properties
@@ -1,5 +1,4 @@
 source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
-               .,\
-               test.xml
+               .
diff --git a/changelog/org.eclipse.linuxtools.changelog.tests/test.xml b/changelog/org.eclipse.linuxtools.changelog.tests/test.xml
deleted file mode 100644
index 6bdf4684ee..0000000000
--- a/changelog/org.eclipse.linuxtools.changelog.tests/test.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="testsuite" default="run" basedir=".">
-	<property name="classname" value="org.eclipse.linuxtools.changelog.core.tests.AllTests" />
-
-	<!-- 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 eclipse-home, and library-file -->
-	<property name="plugin-name" value="org.eclipse.linuxtools.changelog.tests" />
-	<property name="library-file" value="${eclipse-home}/dropins/${subProjectName2}/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="changelog-folder" value="${eclipse-home}/changelog_folder" />
-		<delete dir="${changelog-folder}" quiet="true" />
-		<echo message="Calling ui-test in ${library-file} with eclipse-home = ${eclipse-home} and library-file = ${library-file}"/>
-		<ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
-			<property name="data-dir" value="${changelog-folder}" />
-			<property name="plugin-name" value="${plugin-name}" />
-			<property name="classname" value="${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/${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,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>
diff --git a/gcov/org.eclipse.linuxtools.gcov.test/build.properties b/gcov/org.eclipse.linuxtools.gcov.test/build.properties
index e194bd177a..35db6737fd 100644
--- a/gcov/org.eclipse.linuxtools.gcov.test/build.properties
+++ b/gcov/org.eclipse.linuxtools.gcov.test/build.properties
@@ -2,7 +2,6 @@ source.. = src/
 output.. = bin/

 bin.includes = META-INF/,\

                .,\

-               test.xml,\

                plugin.properties,\

                about.html,\

                resource/

diff --git a/gcov/org.eclipse.linuxtools.gcov.test/test.xml b/gcov/org.eclipse.linuxtools.gcov.test/test.xml
deleted file mode 100755
index bfb67e5613..0000000000
--- a/gcov/org.eclipse.linuxtools.gcov.test/test.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0"?>

-

-<project name="testsuite" default="run" basedir=".">

-	<property name="classname" value="org.eclipse.linuxtools.internal.gcov.test.AllGcovTests" />

-	<property name="plugin-name" value="org.eclipse.linuxtools.gcov.test" />

-

-	<!-- 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/${subProjectName2}/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="gcov_suite">

-		<property name="gcov-folder" value="${eclipse-home}/gcov_folder" />

-		<delete dir="${gcov-folder}" quiet="true" />

-		<ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">

-			<property name="data-dir" value="${gcov-folder}" />

-			<property name="plugin-name" value="${plugin-name}" />

-			<property name="classname" value="${classname}" />

-		</ant>

-	</target>

-

-	<!-- This target holds code to cleanup the testing environment 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,gcov_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/gprof/org.eclipse.linuxtools.gprof.test/build.properties b/gprof/org.eclipse.linuxtools.gprof.test/build.properties
index e1f454cb7f..51166e90e1 100644
--- a/gprof/org.eclipse.linuxtools.gprof.test/build.properties
+++ b/gprof/org.eclipse.linuxtools.gprof.test/build.properties
@@ -2,7 +2,6 @@ source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
-               test.xml,\
                foox_gprof_input/,\
                foocpp_gprof_input/,\
                partially-pg-build_gprof_input/,\
diff --git a/gprof/org.eclipse.linuxtools.gprof.test/test.xml b/gprof/org.eclipse.linuxtools.gprof.test/test.xml
deleted file mode 100755
index 0baa351300..0000000000
--- a/gprof/org.eclipse.linuxtools.gprof.test/test.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0"?>

-

-<project name="testsuite" default="run" basedir=".">

-	<property name="classname" value="org.eclipse.linuxtools.internal.gprof.test.AllGprofTests" />

-	<property name="plugin-name" value="org.eclipse.linuxtools.gprof.test" />

-

-	<!-- 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/${subProjectName2}/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="gprof_suite">

-		<property name="gprof-folder" value="${eclipse-home}/gprof_folder" />

-		<delete dir="${gprof-folder}" quiet="true" />

-		<ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">

-			<property name="data-dir" value="${gprof-folder}" />

-			<property name="plugin-name" value="${plugin-name}" />

-			<property name="classname" value="${classname}" />

-		</ant>

-	</target>

-

-	<!-- This target holds code to cleanup the testing environment 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,gprof_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/lttng/org.eclipse.linuxtools.lttng.core.tests/test.xml b/lttng/org.eclipse.linuxtools.lttng.core.tests/test.xml
deleted file mode 100644
index 6fc78e9206..0000000000
--- a/lttng/org.eclipse.linuxtools.lttng.core.tests/test.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="testsuite" default="run" basedir=".">
-	<property name="classname" value="org.eclipse.linuxtools.lttng.core.tests" />
-	<property name="lttng-event-test-suite-classname" value="org.eclipse.linuxtools.lttng.tests.event.AllLttngTests" />
-	<property name="lttng-jni-test-suite-classname" value="org.eclipse.linuxtools.lttng.tests.jni.AllJniTests" />
-	<property name="plugin-name" value="org.eclipse.linuxtools.lttng.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/${subProjectName2}/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="lttng_event_test_suite">
-		<property name="lttng-folder" value="${eclipse-home}/lttng_folder" />
-		<delete dir="${lttng-folder}" quiet="true" />
-		<ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
-			<property name="data-dir" value="${lttng-folder}" />
-			<property name="plugin-name" value="${plugin-name}" />
-			<property name="classname" value="${lttng-event-test-suite-classname}" />
-		</ant>
-	</target>
-
-	<target name="lttng_jni_test_suite">
-		<property name="lttng-folder" value="${eclipse-home}/lttng_folder" />
-		<delete dir="${lttng-folder}" quiet="true" />
-		<ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
-			<property name="data-dir" value="${lttng-folder}" />
-			<property name="plugin-name" value="${plugin-name}" />
-			<property name="classname" value="${lttng-jni-test-suite-classname}" />
-		</ant>
-	</target>
-
-	<!-- This target holds code to cleanup the testing environment 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,lttng_event_test_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/lttng/org.eclipse.linuxtools.lttng.ui.tests/test.xml b/lttng/org.eclipse.linuxtools.lttng.ui.tests/test.xml
deleted file mode 100644
index 6023af7c3f..0000000000
--- a/lttng/org.eclipse.linuxtools.lttng.ui.tests/test.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="testsuite" default="run" basedir=".">
-	<property name="classname" value="org.eclipse.linuxtools.lttng.ui.tests" />
-	<property name="lttng-ui-test-suite-classname" value="org.eclipse.linuxtools.lttng.ui.tests.TBD" />
-	<property name="plugin-name" value="org.eclipse.linuxtools.lttng.ui.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/${subProjectName2}/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="lttng_ui_test_suite">
-		<property name="lttng-folder" value="${eclipse-home}/lttng_folder" />
-		<delete dir="${lttng-folder}" quiet="true" />
-		<ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
-			<property name="data-dir" value="${lttng-folder}" />
-			<property name="plugin-name" value="${plugin-name}" />
-			<property name="classname" value="${lttng-ui-test-suite-classname}" />
-		</ant>
-	</target>
-
-	<!-- This target holds code to cleanup the testing environment 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,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/lttng/org.eclipse.linuxtools.tmf.core.tests/test.xml b/lttng/org.eclipse.linuxtools.tmf.core.tests/test.xml
deleted file mode 100644
index d654941666..0000000000
--- a/lttng/org.eclipse.linuxtools.tmf.core.tests/test.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="testsuite" default="run" basedir=".">
-	<property name="classname" value="org.eclipse.linuxtools.tmf.core.tests" />
-	<property name="tmf-event-test-suite-classname"   value="org.eclipse.linuxtools.tmf.tests.event.AllTests" />
-	<property name="tmf-request-test-suite-classname" value="org.eclipse.linuxtools.tmf.tests.request.AllTests" />
-	<property name="tmf-trace-test-suite-classname"   value="org.eclipse.linuxtools.tmf.tests.trace.AllTests" />
-	<property name="plugin-name" value="org.eclipse.linuxtools.tmf.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/${subProjectName2}/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="tmf_event_test_suite">
-		<property name="tmf-folder" value="${eclipse-home}/tmf_folder" />
-		<delete dir="${tmf-folder}" quiet="true" />
-		<ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
-			<property name="data-dir" value="${tmf-folder}" />
-			<property name="plugin-name" value="${plugin-name}" />
-			<property name="classname" value="${tmf-event-test-suite-classname}" />
-		</ant>
-	</target>
-
-	<target name="tmf_request_test_suite">
-		<property name="tmf-folder" value="${eclipse-home}/tmf_folder" />
-		<delete dir="${tmf-folder}" quiet="true" />
-		<ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
-			<property name="data-dir" value="${tmf-folder}" />
-			<property name="plugin-name" value="${plugin-name}" />
-			<property name="classname" value="${tmf-request-test-suite-classname}" />
-		</ant>
-	</target>
-
-	<target name="tmf_trace_test_suite">
-		<property name="tmf-folder" value="${eclipse-home}/tmf_folder" />
-		<delete dir="${tmf-folder}" quiet="true" />
-		<ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
-			<property name="data-dir" value="${tmf-folder}" />
-			<property name="plugin-name" value="${plugin-name}" />
-			<property name="classname" value="${tmf-trace-test-suite-classname}" />
-		</ant>
-	</target>
-
-	<!-- This target holds code to cleanup the testing environment 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,tmf_event_test_suite,tmf_request_test_suite,tmf_trace_test_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/lttng/org.eclipse.linuxtools.tmf.ui.tests/test.xml b/lttng/org.eclipse.linuxtools.tmf.ui.tests/test.xml
deleted file mode 100644
index 37506687e3..0000000000
--- a/lttng/org.eclipse.linuxtools.tmf.ui.tests/test.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="testsuite" default="run" basedir=".">
-	<property name="classname" value="org.eclipse.linuxtools.tmf.ui.tests" />
-	<property name="plugin-name" value="org.eclipse.linuxtools.tmf.ui.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/${subProjectName2}/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="tmf_ui_test_suite">
-		<property name="tmfui-folder" value="${eclipse-home}/tmfui_folder" />
-		<delete dir="${tmfui-folder}" quiet="true" />
-		<ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
-			<property name="data-dir" value="${tmfui-folder}" />
-			<property name="plugin-name" value="${plugin-name}" />
-			<property name="classname" value="${classname}" />
-		</ant>
-	</target>
-
-	<!-- This target holds code to cleanup the testing environment 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,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/systemtap/org.eclipse.linuxtools.callgraph.launch.tests/test.xml b/systemtap/org.eclipse.linuxtools.callgraph.launch.tests/test.xml
deleted file mode 100644
index b3a84d7dd0..0000000000
--- a/systemtap/org.eclipse.linuxtools.callgraph.launch.tests/test.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="testsuite" default="run" basedir=".">
-	<property name="classname" value="org.eclipse.linuxtools.callgraph.launch.tests.AllTests" />
-	<property name="plugin-name" value="org.eclipse.linuxtools.callgraph.launch.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="locallaunch_suite">
-		<property name="locallaunch-folder" value="${eclipse-home}/locallaunch_folder" />
-		<delete dir="${localcallgraph-folder}" quiet="true" />
-		<ant target="launch-test" antfile="${library-file}" dir="${eclipse-home}">
-			<property name="data-dir" value="${locallaunch-folder}" />
-			<property name="plugin-name" value="${plugin-name}" />
-			<property name="classname" value="${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/${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,locallaunch_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/systemtap/org.eclipse.linuxtools.callgraph.tests/test.xml b/systemtap/org.eclipse.linuxtools.callgraph.tests/test.xml
deleted file mode 100644
index 26051bcb78..0000000000
--- a/systemtap/org.eclipse.linuxtools.callgraph.tests/test.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="testsuite" default="run" basedir=".">
-	<property name="classname" value="org.eclipse.linuxtools.callgraph.tests.AllTests" />
-	<property name="plugin-name" value="org.eclipse.linuxtools.callgraph.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="localcallgraph_suite">
-		<property name="localcallgraph-folder" value="${eclipse-home}/localcallgraph_folder" />
-		<delete dir="${localcallgraph-folder}" quiet="true" />
-		<ant target="callgraph-test" antfile="${library-file}" dir="${eclipse-home}">
-			<property name="data-dir" value="${localcallgraph-folder}" />
-			<property name="plugin-name" value="${plugin-name}" />
-			<property name="classname" value="${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/${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,localcallgraph_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.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>