diff options
Diffstat (limited to 'jpa')
-rw-r--r-- | jpa/tests/org.eclipse.jpt.core.tests/test.xml | 4 | ||||
-rw-r--r-- | jpa/tests/org.eclipse.jpt.eclipselink.core.tests/test.xml | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/test.xml b/jpa/tests/org.eclipse.jpt.core.tests/test.xml index a56e05c7d7..5d51311a81 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/test.xml +++ b/jpa/tests/org.eclipse.jpt.core.tests/test.xml @@ -32,8 +32,8 @@ <property name="classname" value="org.eclipse.jpt.core.tests.internal.utility.jdt.JptCoreUtilityJdtTests" /> <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/> </ant> - </target>
- <target name="suite2">
<property file="${testRoot}/testServer.properties"/>
<property name="jpt-folder" value="${eclipse-home}/jpt_folder"/>
<delete dir="${jpt-folder}" quiet="true"/>
<ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
<property name="data-dir" value="${jpt-folder}"/>
<property name="plugin-name" value="${plugin-name}"/>
<property name="classname" value="org.eclipse.jpt.core.tests.internal.model.JptCoreModelTests" />
<property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/>
</ant>
</target>
<target name="suite3">
<property file="${testRoot}/testServer.properties"/>
<property name="jpt-folder" value="${eclipse-home}/jpt_folder"/>
<delete dir="${jpt-folder}" quiet="true"/>
<ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
<property name="data-dir" value="${jpt-folder}"/>
<property name="plugin-name" value="${plugin-name}"/>
<property name="classname" value="org.eclipse.jpt.core.tests.internal.resource.JptCoreResourceModelTests" />
<property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/>
<property name="extraVMargs" value="-Dorg.eclipse.jpt.jpa.jar=${testDir}/${jpt-persistence-jar}"/>
</ant>
</target>
<target name="suite4">
<property file="${testRoot}/testServer.properties"/>
<property name="jpt-folder" value="${eclipse-home}/jpt_folder"/>
<delete dir="${jpt-folder}" quiet="true"/>
<ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
<property name="data-dir" value="${jpt-folder}"/>
<property name="plugin-name" value="${plugin-name}"/>
<property name="classname" value="org.eclipse.jpt.core.tests.internal.context.JptCoreContextModelTests" />
<property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/>
<property name="extraVMargs" value="-Dorg.eclipse.jpt.jpa.jar=${testDir}/${jpt-persistence-jar}"/>
</ant>
</target>
+ </target> + <target name="suite2">
<property file="${testRoot}/testServer.properties"/>
<property name="jpt-folder" value="${eclipse-home}/jpt_folder"/>
<delete dir="${jpt-folder}" quiet="true"/>
<ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
<property name="data-dir" value="${jpt-folder}"/>
<property name="plugin-name" value="${plugin-name}"/>
<property name="classname" value="org.eclipse.jpt.core.tests.internal.model.JptCoreModelTests" />
<property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/>
</ant>
</target>
<target name="suite3">
<property file="${testRoot}/testServer.properties"/>
<property name="jpt-folder" value="${eclipse-home}/jpt_folder"/>
<delete dir="${jpt-folder}" quiet="true"/>
<ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
<property name="data-dir" value="${jpt-folder}"/>
<property name="plugin-name" value="${plugin-name}"/>
<property name="classname" value="org.eclipse.jpt.core.tests.internal.resource.JptCoreResourceModelTests" />
<property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/>
<property name="extraVMargs" value="-Dorg.eclipse.jpt.jpa.jar=${testDir}/${jpt-persistence200-jar}"/>
</ant>
</target>
<target name="suite4">
<property file="${testRoot}/testServer.properties"/>
<property name="jpt-folder" value="${eclipse-home}/jpt_folder"/>
<delete dir="${jpt-folder}" quiet="true"/>
<ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
<property name="data-dir" value="${jpt-folder}"/>
<property name="plugin-name" value="${plugin-name}"/>
<property name="classname" value="org.eclipse.jpt.core.tests.internal.context.JptCoreContextModelTests" />
<property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/>
<property name="extraVMargs" value="-Dorg.eclipse.jpt.jpa.jar=${testDir}/${jpt-persistence200-jar}"/>
</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. --> diff --git a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/test.xml b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/test.xml index 09669091c6..2d34045158 100644 --- a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/test.xml +++ b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/test.xml @@ -32,10 +32,10 @@ <property name="plugin-name" value="${plugin-name}"/> <property name="classname" value="org.eclipse.jpt.eclipselink.core.tests.internal.resource.JptEclipselinkCoreResourceModelTests" /> <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/> - <property name="extraVMargs" value="-Dorg.eclipse.jpt.jpa.jar=${testDir}/${jpt-persistence-jar} -Dorg.eclipse.jpt.eclipselink.jar=${testDir}/${jpt-eclipselink-jar}"/> + <property name="extraVMargs" value="-Dorg.eclipse.jpt.jpa.jar=${testDir}/${jpt-persistence200-jar} -Dorg.eclipse.jpt.eclipselink.jar=${testDir}/${jpt-eclipselink200-jar}"/> </ant> - </target>
- <target name="suite2">
<property file="${testRoot}/testServer.properties"/>
<property name="jpt-folder" value="${eclipse-home}/jpt_folder"/>
<delete dir="${jpt-folder}" quiet="true"/>
<ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
<property name="data-dir" value="${jpt-folder}"/>
<property name="plugin-name" value="${plugin-name}"/>
<property name="classname" value="org.eclipse.jpt.eclipselink.core.tests.internal.context.JptEclipseLinkCoreContextModelTests" />
<property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/>
<property name="extraVMargs" value="-Dorg.eclipse.jpt.jpa.jar=${testDir}/${jpt-persistence-jar} -Dorg.eclipse.jpt.eclipselink.jar=${testDir}/${jpt-eclipselink-jar}"/>
</ant>
</target>
+ </target> + <target name="suite2">
<property file="${testRoot}/testServer.properties"/>
<property name="jpt-folder" value="${eclipse-home}/jpt_folder"/>
<delete dir="${jpt-folder}" quiet="true"/>
<ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
<property name="data-dir" value="${jpt-folder}"/>
<property name="plugin-name" value="${plugin-name}"/>
<property name="classname" value="org.eclipse.jpt.eclipselink.core.tests.internal.context.JptEclipseLinkCoreContextModelTests" />
<property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/>
<property name="extraVMargs" value="-Dorg.eclipse.jpt.jpa.jar=${testDir}/${jpt-persistence200-jar} -Dorg.eclipse.jpt.eclipselink.jar=${testDir}/${jpt-eclipselink200-jar}"/>
</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. --> |