Updated test.xml with simpler version

1 files changed, 8 insertions, 36 deletions

diff --git a/tests/org.eclipse.emf.teneo.tests/test.xml b/tests/org.eclipse.emf.teneo.tests/test.xml
index 3afe23893..89bc9a44b 100644
--- a/tests/org.eclipse.emf.teneo.tests/test.xml
+++ b/tests/org.eclipse.emf.teneo.tests/test.xml
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0"?>
 <!--
 /**
  * <copyright>
  *
- * Copyright (c) 2006 IBM Corporation and others.
+ * Copyright (c) 2005 IBM Corporation and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -14,7 +14,7 @@
  *
  * </copyright>
  *
- * $Id: test.xml,v 1.1 2006/07/14 04:42:54 mtaal Exp $
+ * $Id: test.xml,v 1.2 2006/07/17 22:30:44 mtaal Exp $
  */
 -->
 
@@ -39,40 +39,12 @@
 
   <!-- This target defines the tests that need to be run. -->
   <target name="suite">
-	<echo message="Set javacSource and javacTarget = 1.5"/>
-	<property name="javacSource" value="1.5" />
-	<property name="javacTarget" value="1.5" />
-	
-	<path id="bc">
-		<fileset dir="${java.home}/lib">
-			<include name="*.jar" />
-		</fileset>
-	</path>
-	<property name="bootclasspath" refid="bc" />
-
-	<!-- new 060508 to make build work when using JDK1.5 source/target -->
-	<echo message="Set J2SE-1.5 = ${bootclasspath}"/>
-	<property name="J2SE-1.5" value="${bootclasspath}"/>
-	<condition property="bundleBootClasspath" value="${J2SE-1.5}"><isset property="J2SE-1.5"/></condition>
-	<condition property="bundleJavacSource" value="1.5"><isset property="J2SE-1.5"/></condition>
-	<condition property="bundleJavacTarget" value="1.5"><isset property="J2SE-1.5"/></condition>
     <property name="emft-folder" value="${eclipse-home}/emf_folder"/>
     <delete dir="${emft-folder}" quiet="true"/>
-  	<property name="core.test.vmargs" value="-DJ2SE-1.5=${bootclasspath} -Djava15-home=${java.home}"/>
-
-  	<echo message="About to run core-test:"/>
-  	<echo message="library-file = ${library-file}"/>
-  	<echo message="eclipse-home = ${eclipse-home}"/>
-  	<echo message="data-dir = ${emft-folder}"/>
-  	<echo message="plugin-name = ${plugin-name}"/>
-  	<echo message="classname = org.eclipse.emf.teneo.tests.AllTests"/>
-  	<echo message="vmargs = ${core.test.vmargs}"/> 
-	
-    <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}" >
+    <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
       <property name="data-dir" value="${emft-folder}"/>
       <property name="plugin-name" value="${plugin-name}"/>
       <property name="classname" value="org.eclipse.emf.teneo.tests.AllTests"/>
-      <property name="vmargs" value="${core.test.vmargs}"/>
     </ant>
   </target>
 
@@ -85,10 +57,10 @@
   <!-- 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>
+    <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>