From 65573eafac420e524a7bb9cea1f34c8a087d22ba Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Tue, 7 Aug 2012 23:12:37 +0000
Subject: [PATCH] Use ScalaTest jars in routerconsole tests
---
apps/routerconsole/java/build.xml | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/apps/routerconsole/java/build.xml b/apps/routerconsole/java/build.xml
index 024de53b63..8b97cc0f0f 100644
--- a/apps/routerconsole/java/build.xml
+++ b/apps/routerconsole/java/build.xml
@@ -344,7 +344,11 @@
</target>
<!-- unit tests -->
- <target name="scalatest.compileTest" depends="compile, scala.init">
+ <target name="builddepscalatest">
+ <ant dir="../../../router/java/" target="jar" />
+ <ant dir="../../../router/java/" target="jarScalaTest" />
+ </target>
+ <target name="scalatest.compileTest" depends="builddepscalatest, compile, scala.init">
<mkdir dir="./build" />
<mkdir dir="./build/obj_scala" />
<scalac srcdir="./test/scalatest" destdir="./build/obj_scala" deprecation="on" >
@@ -352,8 +356,8 @@
<pathelement location="${classpath}" />
<pathelement location="${scala-library.jar}" />
<pathelement location="${scalatest.jar}" />
- <pathelement location="../../../core/java/build/i2p.jar" />
- <pathelement location="../../../router/java/build/router.jar" />
+ <pathelement location="../../../core/java/build/i2pscalatest.jar" />
+ <pathelement location="../../../router/java/build/routerscalatest.jar" />
<pathelement location="./build/obj" />
</classpath>
</scalac>
--
GitLab