From 60ea6727f1a089f6afd17fcea3bd7d29353af9b4 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Tue, 29 Nov 2011 04:50:16 +0100
Subject: Add 'TestJarsInJar.jar' test JAR file for upcoming JarUtil tests (Jar
 in Jar).

---
 make/build-test.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'make/build-test.xml')

diff --git a/make/build-test.xml b/make/build-test.xml
index 7c522cf..cbd7ce0 100644
--- a/make/build-test.xml
+++ b/make/build-test.xml
@@ -54,6 +54,7 @@
         <property name="gluegen-rt.jar" location="${gluegen.root}/${rootrel.build}/gluegen-rt.jar" />
         <property name="gluegen.lib" value="${gluegen.root}/${rootrel.build}/obj" />
 
+        <property name="TestJarsInJar.jar" location="${gluegen.root}/make/lib/TestJarsInJar.jar" />
         <property name="gluegen-test.jar" location="${build_t}/gluegen-test.jar" />
         <property name="gluegen-test.apk" location="${build_t}/gluegen-test.apk" />
 
@@ -73,11 +74,12 @@
 
         <path id="junit.run.classpath">
             <pathelement location="${junit.jar}" />
+            <pathelement location="${TestJarsInJar.jar}" />
             <pathelement location="${gluegen.jar}" />
             <pathelement location="${gluegen-test.jar}" />
         </path>
-        <property name="junit.run.jars" value="${junit.jar}${path.separator}${ant.jar}${path.separator}${gluegen.root}/${rootrel.build}/gluegen.jar${path.separator}${build_t}/gluegen-test.jar"/>
-        <property name="junit.run.remote.jars" value="${junit.jar}${path.separator}${env.TARGET_ANT_HOME}/lib/ant.jar${path.separator}${env.TARGET_ANT_HOME}/lib/ant-junit.jar${path.separator}${gluegen.root}/${rootrel.build}/gluegen.jar${path.separator}${build_t}/gluegen-test.jar"/>
+        <property name="junit.run.jars" value="${junit.jar}${path.separator}${ant.jar}${path.separator}${TestJarsInJar.jar}${path.separator}${gluegen.root}/${rootrel.build}/gluegen.jar${path.separator}${build_t}/gluegen-test.jar"/>
+        <property name="junit.run.remote.jars" value="${junit.jar}${path.separator}${env.TARGET_ANT_HOME}/lib/ant.jar${path.separator}${env.TARGET_ANT_HOME}/lib/ant-junit.jar${path.separator}${TestJarsInJar.jar}${path.separator}${gluegen.root}/${rootrel.build}/gluegen.jar${path.separator}${build_t}/gluegen-test.jar"/>
         <property name="junit.run.remote.apks" value="${ant-junit-all.apk}${path.separator}${gluegen.root}/${rootrel.build}/gluegen.apk${path.separator}${build_t}/gluegen-test.apk"/>
 
         <property name="stub.includes.dir" value="stub_includes" /> <!-- NOTE:  this MUST be relative for FileSet -->
-- 
cgit v1.2.3