From 8bec14de2d0160a253518da8a57b93c0e62af986 Mon Sep 17 00:00:00 2001
From: wwalker <wwalker@u001042-lin.austin.arm.com>
Date: Tue, 4 Jan 2011 15:24:14 -0600
Subject: Fixed to work properly in the Ant junit.run.* tasks

Fixed the texture load to come from a resource stream so it'll
work when run from inside a JAR by the junit.run.* Ant tasks.
Also modified the test JAR build step to include any resource
files in the test source code directory.
---
 make/build-test.xml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

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

diff --git a/make/build-test.xml b/make/build-test.xml
index 40bdcf7a3..ae545df63 100644
--- a/make/build-test.xml
+++ b/make/build-test.xml
@@ -87,8 +87,15 @@
             <fileset file="${jogl.test.jar}" />
         </delete>
         <jar destfile="${jogl.test.jar}" filesonly="true">
+            <!-- get all class files, but skip any resource files that external tools
+                 might have copied into the class directory (otherwise, it's possible
+                 to get the same resource file twice in the jar) -->
             <fileset dir="${classes}">
-                <include name="${java.part.test}"/>
+                <include name="${java.part.test}/*.class"/>
+            </fileset>
+            <!-- include any resource files that tests may requre -->
+            <fileset dir="${src.test}">
+                <exclude name="**/*.java"/>
             </fileset>
         </jar>
     </target>
-- 
cgit v1.2.3