Tests: Fix lone i2ptunnel test classpath,

add to top-level ant test target (was only run on gradle side)
This commit is contained in:
zzz
2024-02-14 06:00:29 -05:00
parent 4e99c392f6
commit 6575fbfe6a
2 changed files with 10 additions and 1 deletions

View File

@@ -449,6 +449,7 @@
<target name="compileTest">
<mkdir dir="./build" />
<mkdir dir="./build/obj" />
<property name="junit.home" value="${ant.home}/lib/" />
<!-- We need the ant runtime, as it includes junit -->
<javac srcdir="./src:./test/junit" debug="true" source="${javac.version}" target="${javac.version}"
release="${javac.release}"
@@ -459,6 +460,7 @@
<classpath>
<pathelement location="../../../core/java/build/i2p.jar" />
<pathelement location="../../ministreaming/java/build/mstreaming.jar" />
<pathelement location="${junit.home}/junit4.jar" />
</classpath>
</javac>
</target>
@@ -469,6 +471,9 @@
<pathelement path="${classpath}" />
<pathelement location="./build/obj" />
<pathelement location="../../../core/java/build/i2p.jar" />
<pathelement location="../../ministreaming/java/build/mstreaming.jar" />
<pathelement location="../../streaming/java/build/streaming.jar" />
<pathelement location="${junit.home}/junit4.jar" />
</classpath>
<batchtest>
<fileset dir="./test/junit/">

View File

@@ -2060,6 +2060,7 @@
<ant dir="apps/ministreaming/java/" target="junit.compileTest" />
<ant dir="apps/streaming/java/" target="junit.compileTest" />
-->
<ant dir="apps/i2ptunnel/java/" target="compileTest" />
</target>
<target name="prepTest" depends="prepupdate, buildTest">
<!-- overwrite i2p.jar and router.jar with the test versions -->
@@ -2079,7 +2080,7 @@
<ant dir="router/java/" target="scalatest.test" />
</target>
<!-- both junit and scala -->
<target name="test" depends="testCore, testRouter, testMinistreaming, testStreaming" />
<target name="test" depends="testCore, testRouter, testMinistreaming, testStreaming, testI2PTunnel" />
<target name="testCore" depends="buildProperties, jbigi" >
<ant dir="core/java/" target="test" />
</target>
@@ -2092,6 +2093,9 @@
<target name="testStreaming" depends="buildProperties" >
<ant dir="apps/streaming/java/" target="test" />
</target>
<target name="testI2PTunnel" depends="buildStreaming" >
<ant dir="apps/i2ptunnel/java/" target="test" />
</target>
<target name="scalatest.report" depends="buildProperties" >
<ant dir="core/java/" target="scalatest.report" />
<ant dir="router/java/" target="scalatest.report" />