diff options
| author | mtaal | 2006-07-23 18:20:12 +0000 |
|---|---|---|
| committer | mtaal | 2006-07-23 18:20:12 +0000 |
| commit | ce0ee2d61cd4fa27a05028952eff639d6fa71439 (patch) | |
| tree | 4224798704990d643a64e07d2d2ddc0182d13b73 /tests/org.eclipse.emf.teneo.tests | |
| parent | 280dd003464a5545d7cbc2f52ed67969cda8c16d (diff) | |
| download | org.eclipse.emf.teneo-ce0ee2d61cd4fa27a05028952eff639d6fa71439.tar.gz org.eclipse.emf.teneo-ce0ee2d61cd4fa27a05028952eff639d6fa71439.tar.xz org.eclipse.emf.teneo-ce0ee2d61cd4fa27a05028952eff639d6fa71439.zip | |
Reorganised test.xml
Diffstat (limited to 'tests/org.eclipse.emf.teneo.tests')
| -rw-r--r-- | tests/org.eclipse.emf.teneo.tests/META-INF/MANIFEST.MF | 4 | ||||
| -rw-r--r-- | tests/org.eclipse.emf.teneo.tests/test.xml | 15 |
2 files changed, 6 insertions, 13 deletions
diff --git a/tests/org.eclipse.emf.teneo.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.teneo.tests/META-INF/MANIFEST.MF index 0cbeb5b94..3376c734b 100644 --- a/tests/org.eclipse.emf.teneo.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.emf.teneo.tests/META-INF/MANIFEST.MF @@ -7,4 +7,6 @@ Bundle-Vendor: %Plugin.providerName Bundle-Localization: plugin Require-Bundle: org.junit;bundle-version="[3.8.0,4.0.0)", org.eclipse.core.runtime, - org.eclipse.emf.teneo.hibernate.test + org.eclipse.emf.teneo.hibernate.test, + org.eclipse.emf.teneo.jpox.generate.test, + org.eclipse.emf.teneo.jpox.test diff --git a/tests/org.eclipse.emf.teneo.tests/test.xml b/tests/org.eclipse.emf.teneo.tests/test.xml index ef60aca18..303249290 100644 --- a/tests/org.eclipse.emf.teneo.tests/test.xml +++ b/tests/org.eclipse.emf.teneo.tests/test.xml @@ -33,24 +33,15 @@ <echo message="Done: [${runtests-endtime}]"/> </target> - <target name="runtests_generate" depends="setup" description="Runs ant on the test_generate.xml for a specified plugin. Requires a property value setting for testPlugin only if test.properties is not available. The property testPlugin represents a directory name made up of the plugin id and plugin version. This directory must contain a valid test.xml."> - <tstamp><format property="runtests-starttime" pattern="HH:mm:ss"/></tstamp> - <echo message="Start: [${runtests-starttime}]"/> - <ant antfile="${eclipse-home}/plugins/${testPlugin}/test_generate.xml" dir="${eclipse-home}" /> - <copy file="${eclipse-home}/${report}.xml" tofile="${results}/xml/${report}_${platform}.xml" /> - <tstamp><format property="runtests-endtime" pattern="HH:mm:ss"/></tstamp> - <echo message="Done: [${runtests-endtime}]"/> - </target> - <target name="teneo" description="Runs the test.xml of the test plugins"> <antcall target="runtests"> <param name="testPlugin" value="${org.eclipse.emf.teneo.hibernate.test}" /> <param name="report" value="org.eclipse.emf.teneo.hibernate.test" /> </antcall> - <antcall target="runtests_generate"> - <param name="testPlugin" value="${org.eclipse.emf.teneo.jpox.test}" /> - <param name="report" value="org.eclipse.emf.teneo.jpox.test" /> + <antcall target="runtests"> + <param name="testPlugin" value="${org.eclipse.emf.teneo.jpox.generate.test}" /> + <param name="report" value="org.eclipse.emf.teneo.jpox.generate.test" /> </antcall> <antcall target="runtests"> |