aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Aniszczyk2011-03-08 15:54:30 (EST)
committerAndrew Overholt2011-04-13 14:14:45 (EDT)
commitaf77456a91518f2911b4304e896f74b205a7fb8c (patch)
tree74f5f6316fd75c5d31c0a7029978e403e3016c34
parente4a23d79708ed97766cfe5e3a3e388f76fb18070 (diff)
downloadorg.eclipse.linuxtools-af77456a91518f2911b4304e896f74b205a7fb8c.zip
org.eclipse.linuxtools-af77456a91518f2911b4304e896f74b205a7fb8c.tar.gz
org.eclipse.linuxtools-af77456a91518f2911b4304e896f74b205a7fb8c.tar.bz2
Clean up the autotools tests for the tycho-build
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
-rw-r--r--autotools/org.eclipse.linuxtools.cdt.autotools.tests/pom.xml5
-rw-r--r--autotools/org.eclipse.linuxtools.cdt.autotools.tests/test.xml75
2 files changed, 4 insertions, 76 deletions
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.tests/pom.xml b/autotools/org.eclipse.linuxtools.cdt.autotools.tests/pom.xml
index 3a2f666..b1ce4c2 100644
--- a/autotools/org.eclipse.linuxtools.cdt.autotools.tests/pom.xml
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.tests/pom.xml
@@ -36,8 +36,11 @@
<!-- test mojo matches TestProject be default and treats it as PojoTest -->
<exclude>**/Test*.class</exclude>
</excludes>
- <useUIHarness>false</useUIHarness>
+ <testSuite>org.eclipse.linuxtools.cdt.autotools.tests</testSuite>
+ <testClass>org.eclipse.linuxtools.cdt.autotools.tests.AllAutotoolsTests</testClass>
+ <useUIHarness>true</useUIHarness>
<useUIThread>false</useUIThread>
+ <product>org.eclipse.sdk.ide</product>
</configuration>
</plugin>
<plugin>
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.tests/test.xml b/autotools/org.eclipse.linuxtools.cdt.autotools.tests/test.xml
deleted file mode 100644
index 2cdb85d..0000000
--- a/autotools/org.eclipse.linuxtools.cdt.autotools.tests/test.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="testsuite" default="run" basedir=".">
- <property name="classname" value="org.eclipse.linuxtools.cdt.autotools.tests.AllAutotoolsTests" />
- <property name="autoconf_classname" value="org.eclipse.linuxtools.cdt.autotools.tests.autoconf.AutoconfTests" />
- <property name="editors_classname" value="org.eclipse.linuxtools.cdt.autotools.tests.editors.EditorTests" />
-
- <!-- 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.cdt.autotools.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="autotools-folder" value="${eclipse-home}/autotools_folder" />
- <delete dir="${autotools-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="${autotools-folder}" />
- <property name="plugin-name" value="${plugin-name}" />
- <property name="classname" value="${classname}" />
- </ant>
- </target>
-
- <target name="autoconf_suite">
- <property name="autoconf-folder" value="${eclipse-home}/autoconf_folder" />
- <delete dir="${autoconf-folder}" quiet="true" />
- <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
- <property name="data-dir" value="${autoconf-folder}" />
- <property name="plugin-name" value="${plugin-name}" />
- <property name="classname" value="${autoconf_classname}" />
- </ant>
- </target>
-
- <target name="editors_suite">
- <property name="editors-folder" value="${eclipse-home}/editors_folder" />
- <delete dir="${editors-folder}" quiet="true" />
- <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
- <property name="data-dir" value="${editors-folder}" />
- <property name="plugin-name" value="${plugin-name}" />
- <property name="classname" value="${editors_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,autoconf_suite,editors_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>