diff options
| author | wwalker <[email protected]> | 2011-01-04 15:24:14 -0600 |
|---|---|---|
| committer | wwalker <[email protected]> | 2011-01-04 15:24:14 -0600 |
| commit | 8bec14de2d0160a253518da8a57b93c0e62af986 (patch) | |
| tree | 4a3c2abd959794439682c3efc8768a3e79513557 /make/build-test.xml | |
| parent | b50e75044196aa1f11e7b367b457163553ea373f (diff) | |
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.
Diffstat (limited to 'make/build-test.xml')
| -rw-r--r-- | make/build-test.xml | 9 |
1 files changed, 8 insertions, 1 deletions
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> |