Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrescobar2010-10-26 20:43:04 -0400
committerRyan D. Brooks2010-10-26 20:43:04 -0400
commit5d898972dde96ca28f0d415dad50a1a95b962265 (patch)
tree6b06c237a9bf940cea22230bdb1d0331a0543968 /plugins/org.eclipse.osee.client.integration.tests
parentf8233fe0e5c9ac0f9f9b6920fd7b9ae2b5021f19 (diff)
downloadorg.eclipse.osee-5d898972dde96ca28f0d415dad50a1a95b962265.tar.gz
org.eclipse.osee-5d898972dde96ca28f0d415dad50a1a95b962265.tar.xz
org.eclipse.osee-5d898972dde96ca28f0d415dad50a1a95b962265.zip
refinement: Enable Client Integration Tests
Diffstat (limited to 'plugins/org.eclipse.osee.client.integration.tests')
-rw-r--r--plugins/org.eclipse.osee.client.integration.tests/test.xml3
-rw-r--r--plugins/org.eclipse.osee.client.integration.tests/testAppServerLaunch.xml2
2 files changed, 3 insertions, 2 deletions
diff --git a/plugins/org.eclipse.osee.client.integration.tests/test.xml b/plugins/org.eclipse.osee.client.integration.tests/test.xml
index ac2f35e048..4da7aa3ec5 100644
--- a/plugins/org.eclipse.osee.client.integration.tests/test.xml
+++ b/plugins/org.eclipse.osee.client.integration.tests/test.xml
@@ -39,7 +39,8 @@
<property name="testWorkspace" value="${eclipse-home}/testWorkspace" />
<delete dir="${testWorkspace}" quiet="true" />
- <ant antfile="${basedir}/testAppServerLaunch.xml" target="run" inheritall="true" inheritrefs="true" />
+ <dirname property="dependencies.basedir" file="${ant.file}"/>
+ <ant antfile="${dependencies.basedir}/testAppServerLaunch.xml" target="run" inheritall="true" inheritrefs="true" />
<!-- <ant target="swtbot-test" antfile="${library-file}" dir="${eclipse-home}"> -->
<ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}" inheritall="true" inheritrefs="true">
diff --git a/plugins/org.eclipse.osee.client.integration.tests/testAppServerLaunch.xml b/plugins/org.eclipse.osee.client.integration.tests/testAppServerLaunch.xml
index cfc62c1b8a..410c6adde6 100644
--- a/plugins/org.eclipse.osee.client.integration.tests/testAppServerLaunch.xml
+++ b/plugins/org.eclipse.osee.client.integration.tests/testAppServerLaunch.xml
@@ -108,7 +108,7 @@
<property name="additionalJvmArgs" value=" -Dosee.db.embedded.server=${osee.db.address}:${osee.db.port}" />
</target>
- <target name="run" depends="init,writePosgresqlConnectionFile,writeDerbyConnectionFile,launchServer" />
+ <target name="run" depends="init,writeH2ConnectionFile,writePosgresqlConnectionFile,writeDerbyConnectionFile,launchServer" />
<target name="launchServer">
<pathconvert property="launcherJarPath" setonempty="false">

Back to the top