stephan 2003/04/14 02:00:07
Modified: src/targets test-build.xml
tools/src blocks-build.xsl
Log:
Canged classpath for tests, adding echo statement for classpath
to debug.
Revision Changes Path
1.11 +16 -13 cocoon-2.1/src/targets/test-build.xml
Index: test-build.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/targets/test-build.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- test-build.xml 11 Apr 2003 10:15:00 -0000 1.10
+++ test-build.xml 14 Apr 2003 09:00:05 -0000 1.11
@@ -13,11 +13,26 @@
</copy>
<path id="test.classpath">
+ <path refid="classpath"/>
+
+ <pathelement location="${build.dest}" />
+ <!-- FIXME Resolver tests depend on deprecated stuff -->
+ <pathelement location="${build.deprecated}" />
+
+ <pathelement location="${build.test}" />
+
<fileset dir="${tools.lib}">
<include name="*.jar"/>
</fileset>
</path>
+ <property name="test.classpath.value"
+ refid="test.classpath"/>
+
+ <echo message="------------ test.classpath ------------"/>
+ <echo message="test.classpath=${test.classpath.value}"/>
+ <echo message="----------------------------------------"/>
+
<!-- Compile tests -->
<javac srcdir="${test}"
destdir="${build.test}"
@@ -26,24 +41,11 @@
deprecation="${compiler.deprecation}"
target="${target.vm}"
fork="true">
- <classpath refid="classpath"/>
<classpath refid="test.classpath"/>
- <classpath>
- <pathelement location="${build.dest}" />
- <!-- FIXME Resolver tests depend on deprecated stuff -->
- <pathelement location="${build.deprecated}" />
- </classpath>
</javac>
<junit printsummary="yes" haltonfailure="yes" fork="yes">
- <classpath refid="classpath"/>
<classpath refid="test.classpath"/>
- <classpath>
- <pathelement location="${build.test}" />
- <pathelement location="${build.dest}" />
- <!-- FIXME Resolver tests depend on deprecated stuff -->
- <pathelement location="${build.deprecated}" />
- </classpath>
<formatter type="plain" usefile="no" />
<batchtest>
<fileset dir="${build.test}">
@@ -80,5 +82,6 @@
inheritAll="true"
inheritRefs="false"
target="tests"/>
+
</target>
1.13 +4 -4 cocoon-2.1/tools/src/blocks-build.xsl
Index: blocks-build.xsl
===================================================================
RCS file: /home/cvs/cocoon-2.1/tools/src/blocks-build.xsl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- blocks-build.xsl 11 Apr 2003 10:32:12 -0000 1.12
+++ blocks-build.xsl 14 Apr 2003 09:00:07 -0000 1.13
@@ -307,17 +307,17 @@
<javac srcdir="{string('${blocks}')}/{$block-name}/test"
destdir="{string('${build.blocks}')}/{$block-name}/test"
fork="true">
- <classpath refid="test.classpath"/>
- <classpath refid="{$block-name}.classpath"/>
<classpath>
+ <path refid="test.classpath"/>
+ <path refid="{$block-name}.classpath"/>
<pathelement location="{string('${build.test}')}"/>
</classpath>
</javac>
<junit printsummary="yes" haltonfailure="yes" fork="yes">
- <classpath refid="test.classpath"/>
- <classpath refid="{$block-name}.classpath"/>
<classpath>
+ <path refid="test.classpath"/>
+ <path refid="{$block-name}.classpath"/>
<pathelement location="{string('${build.test}')}"/>
<pathelement
location="{string('${build.blocks}')}/{$block-name}/test"/>
</classpath>
