Tests: Enable all tests ; Remove 'test' target -> 'junit.run' ; Fix junit chained tests;

Enable all tests

- Remove 'test' target -> 'junit.run'
  - calls build.xml tests first, then
  - calls build-junit.xml tests

- build.xml unit tests were disabled, enable them via junit.run

1 files changed, 2 insertions, 7 deletions

diff --git a/make/build-junit.xml b/make/build-junit.xml
index 1e41e3e..72428b4 100644
--- a/make/build-junit.xml
+++ b/make/build-junit.xml
@@ -22,9 +22,9 @@
         <property name="make" value="." />
 
         <property name="test.base.dir"  value="${gluegen.root}/src/junit" />
-        <property name="test.junit.rel" value="com/jogamp" />
+        <property name="test.junit.rel" value="com/jogamp/gluegen/test/junit" />
         <property name="test.junit.dir" value="${test.base.dir}/${test.junit.rel}" />
-        <property name="test.junit.generation.rel" value="${test.junit.rel}/gluegen/test/junit/generation" />
+        <property name="test.junit.generation.rel" value="${test.junit.rel}/generation" />
         <property name="test.junit.generation.dir" value="${test.base.dir}/${test.junit.generation.rel}" />
 
         <property name="test.dir"     value="${gluegen.root}/${rootrel.build}/test"/>
@@ -186,11 +186,6 @@
     </target>
 
     <target name="junit.run" depends="init,gluegen.cpptasks.detect.os">
-        <mkdir dir="${results}"/>
-        <delete quiet="true">
-            <fileset dir="${results}" includes="**"/>
-        </delete>
-
         <!-- Use absolute path -->
         <property name="gluegen.lib.abs" location="${gluegen.lib}" />
         <property name="build_t.lib.abs" location="${build_t.lib}" />