You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by jv...@apache.org on 2002/02/18 06:39:44 UTC
cvs commit: jakarta-turbine-3 build-test.xml default.properties testing.properties
jvanzyl 02/02/17 21:39:44
Modified: . Tag: rundata_security_changes build-test.xml
default.properties testing.properties
Log:
- moving more test properties to the props files and removing from
the xml files. unit/runtime tests pass again.
Revision Changes Path
No revision
No revision
1.11.2.9 +7 -10 jakarta-turbine-3/build-test.xml
Index: build-test.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/build-test.xml,v
retrieving revision 1.11.2.8
retrieving revision 1.11.2.9
diff -u -r1.11.2.8 -r1.11.2.9
--- build-test.xml 18 Feb 2002 04:56:36 -0000 1.11.2.8
+++ build-test.xml 18 Feb 2002 05:39:43 -0000 1.11.2.9
@@ -26,7 +26,8 @@
<create-path rid="classpath" descriptor="${deps}" basedir="${lib.repo}"/>
<create-patternset rid="runtime.test.set" descriptor="${runtime.test.set}"/>
<create-path rid="test.src.set" descriptor="${test.src.set}"/>
-
+ <create-patternset rid="unit.test.set" descriptor="${unit.test.set}"/>
+ <create-patternset rid="rt.test.set" descriptor="${rt.test.set}"/>
</target>
<!-- ================================================================== -->
@@ -43,9 +44,9 @@
<javac
destdir="${build.dest}"
excludes="**/package.html"
- debug="${debug}"
- deprecation="${deprecation}"
- optimize="${optimize}">
+ debug="${compile.debug}"
+ deprecation="${compile.deprecation}"
+ optimize="${compile.optimize}">
<classpath>
<path refid="classpath"/>
<pathelement path="${build.dest}"/>
@@ -80,8 +81,7 @@
</classpath>
<batchtest todir="${test.reportsDirectory}">
<fileset dir="${build.dest}">
- <include name="**/*Test.class"/>
- <exclude name="**/*ServletTest.class"/>
+ <patternset refid="unit.test.set"/>
</fileset>
</batchtest>
</junit>
@@ -142,6 +142,7 @@
<formatter type="plain" usefile="false"/>
<batchtest>
<fileset dir="${build.dest}">
+ <patternset refid="rt.test.set"/>
<include name="**/*ServletTest.class"/>
</fileset>
</batchtest>
@@ -272,10 +273,6 @@
if="tomcat.home.40">
<echo message="tomcat.home.40 = ${tomcat.home.40}"/>
-
- <property name="out.tomcat40.dir" value="${out.test.dir}/tomcat40"/>
- <property name="conf.tomcat40.dir" value="${conf.test.dir}/tomcat40"/>
- <property name="out.tomcat40.full.dir" value="${basedir}/${out.tomcat40.dir}"/>
<filter token="out.tomcat40.full.dir" value="${out.tomcat40.full.dir}"/>
<filter token="test.port" value="${test.port}"/>
1.12.2.13 +3 -0 jakarta-turbine-3/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/default.properties,v
retrieving revision 1.12.2.12
retrieving revision 1.12.2.13
diff -u -r1.12.2.12 -r1.12.2.13
--- default.properties 18 Feb 2002 04:56:36 -0000 1.12.2.12
+++ default.properties 18 Feb 2002 05:39:43 -0000 1.12.2.13
@@ -27,6 +27,9 @@
src.aspect.set = ${project.defs}/src.aspect.set
runtime.test.set = ${project.defs}/runtime-test.resources
test.src.set = ${project.defs}/test.src.set
+unit.test.set = ${project.defs}/unit.test.set
+rt.test.set = ${project.defs}/rt.test.set
+rttest.dir = ${src.dir}/rttest
src.dir = ${basedir}/src
conf.dir = ${basedir}/conf
1.1.2.2 +4 -0 jakarta-turbine-3/Attic/testing.properties
Index: testing.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/Attic/testing.properties,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- testing.properties 18 Feb 2002 01:50:14 -0000 1.1.2.1
+++ testing.properties 18 Feb 2002 05:39:43 -0000 1.1.2.2
@@ -8,6 +8,10 @@
conf.test.dir = ${rttest.dir}/cactus
out.test.dir = ${build.dir}/rttest
+out.tomcat40.dir = ${out.test.dir}/tomcat40
+conf.tomcat40.dir = ${conf.test.dir}/tomcat40
+out.tomcat40.full.dir = ${out.tomcat40.dir}
+
# Port that will be used to start the servlet engines for testing. This is
# optional and if omitted will default to 8080. This is used when you don't
# want to interfere with a running servlet engine on port 8080.
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>