You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by bl...@apache.org on 2003/03/31 18:23:16 UTC
cvs commit: avalon-excalibur/datasource build.xml default.properties
bloritsch 2003/03/31 08:23:14
Modified: datasource build.xml default.properties
Log:
fix a typo for starting the server
Revision Changes Path
1.42 +40 -20 avalon-excalibur/datasource/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/avalon-excalibur/datasource/build.xml,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- build.xml 31 Mar 2003 16:03:17 -0000 1.41
+++ build.xml 31 Mar 2003 16:23:14 -0000 1.42
@@ -277,35 +277,55 @@
<echo message="Performing Unit Tests" />
<mkdir dir="${build.tests}"/>
-
- <java fork="true" classname="org.hsqldb.Server">
+ <!--
+ <parallel>
+ <sequential>
+ <java fork="true" classname="org.hsqldb.Server">
<classpath refid="test.class.path"/>
- </java>
-
- <junit fork="true"
- haltonfailure="${junit.failonerror}"
- printsummary="yes"
- dir="${build.tests}">
-
- <sysproperty key="test.jdbc.driver" value="${test.jdbc.driver}"/>
- <sysproperty key="test.jdbc.url" value="${test.jdbc.url}"/>
- <sysproperty key="test.jdbc.user" value="${test.jdbc.user}"/>
- <sysproperty key="test.jdbc.password" value="${test.jdbc.password}"/>
-
+ </java>
+ <waitfor maxwait="5" maxwaitunit="minute">
+ <available file="test.done"/>
+ </waitfor>
+ <java fork="true" classname="org.hsqldb.Server">
+ <classpath refid="test.class.path"/>
+ </java>
+ </sequential>
+ <sequential>
+ <waitfor maxwait="30" maxwaitunit="second">
+ <available file="test.data"/>
+ </waitfor>
+ -->
+ <junit fork="true"
+ haltonfailure="${junit.failonerror}"
+ printsummary="yes"
+ dir="${build.tests}">
+
+ <sysproperty key="test.jdbc.driver" value="${test.jdbc.driver}"/>
+ <sysproperty key="test.jdbc.url" value="${test.jdbc.url}"/>
+ <sysproperty key="test.jdbc.user" value="${test.jdbc.user}"/>
+ <sysproperty key="test.jdbc.password" value="${test.jdbc.password}"/>
- <classpath refid="test.class.path"/>
+ <classpath refid="test.class.path"/>
- <formatter type="xml"/> <!-- xml reports for junitreport -->
- <formatter type="plain" usefile="false"/> <!-- text reports for humans -->
+ <formatter type="xml"/> <!-- xml reports for junitreport -->
+ <formatter type="plain" usefile="false"/> <!-- text reports for humans -->
- <batchtest todir="${build.tests}">
+ <batchtest todir="${build.tests}">
<fileset dir="${build.testclasses}">
<include name="**/test/*TestCase.class"/>
<exclude name="**/test/*JdbcTestCase.class" unless="test.jdbc"/>
<exclude name="**/Abstract*"/>
</fileset>
- </batchtest>
- </junit>
+ </batchtest>
+ </junit>
+ <echo file="test.done" append="false">done</echo>
+ <!--
+ </sequential>
+ </parallel> -->
+ <delete>
+ <fileset dir="." includes="test.*"/>
+ </delete>
+
</target>
1.23 +1 -1 avalon-excalibur/datasource/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/avalon-excalibur/datasource/default.properties,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- default.properties 25 Mar 2003 20:01:47 -0000 1.22
+++ default.properties 31 Mar 2003 16:23:14 -0000 1.23
@@ -67,7 +67,7 @@
test.jdbc.driver.jar=lib/hsqldb-1.7.1.jar
test.jdbc.driver=org.hsqldb.jdbcDriver
-test.jdbc.url=jdbc:hsqldb://localhost
+test.jdbc.url=jdbc:hsqldb:.
test.jdbc.user=SA
test.jdbc.password=
test.jdbc=true
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org