From 2868816971bb80eb226e6edffc527d909ced755b Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Fri, 24 Jan 2014 02:44:26 +0100
Subject: Refine test/TestMultiAndFatJar: Demoing test class outside of fat and
 multi jar

Use 'output' folder

- Copy jogl-test.jar and junit.jar to output, to be used in executing (run-*.sh)

Works here ..
---
 test/TestMultiAndFatJar/make-fat_and_multi.sh | 17 ++++++++++++-----
 test/TestMultiAndFatJar/run-fat.sh            | 11 ++++++++---
 test/TestMultiAndFatJar/run-multi.sh          | 11 ++++++++---
 3 files changed, 28 insertions(+), 11 deletions(-)

(limited to 'test')

diff --git a/test/TestMultiAndFatJar/make-fat_and_multi.sh b/test/TestMultiAndFatJar/make-fat_and_multi.sh
index 945d29b..de031be 100644
--- a/test/TestMultiAndFatJar/make-fat_and_multi.sh
+++ b/test/TestMultiAndFatJar/make-fat_and_multi.sh
@@ -5,11 +5,12 @@ JOGL=$THISDIR/../../../jogl
 bdir=build-x86_64
 
 rm -rf temp
+rm -rf output
+mkdir output
 
 #
 # make fat
 #
-rm -f jogl-fat.jar
 mkdir temp
 cd temp
 unzip -o $GLUEGEN/$bdir/gluegen-rt.jar 
@@ -19,27 +20,33 @@ unzip -o $JOGL/$bdir/jar/jogl-all-natives-linux-amd64.jar
 mkdir -p natives/linux-amd64
 mv lib*.so natives/linux-amd64/
 rm -rf META-INF
-jar cf ../jogl-fat.jar *
+jar cf ../output/jogl-fat.jar *
 cd ..
 rm -rf temp
 
 #
 # make multi
 #
-rm -f jogl-multi.jar jogl-multi-natives-linux-amd64.jar
 mkdir temp
 cd temp
 unzip -o $GLUEGEN/$bdir/gluegen-rt.jar 
 unzip -o $JOGL/$bdir/jar/jogl-all.jar
 rm -rf META-INF
-jar cf ../jogl-multi.jar *
+jar cf ../output/jogl-multi.jar *
 rm -rf *
 unzip -o $GLUEGEN/$bdir/gluegen-rt-natives-linux-amd64.jar 
 unzip -o $JOGL/$bdir/jar/jogl-all-natives-linux-amd64.jar
 mkdir -p natives/linux-amd64
 mv lib*.so natives/linux-amd64/
 rm -rf META-INF
-jar cf ../jogl-multi-natives-linux-amd64.jar *
+jar cf ../output/jogl-multi-natives-linux-amd64.jar *
+
 cd ..
 rm -rf temp
 
+#
+# Just to run some tests
+#
+cp -a $JOGL/$bdir/jar/jogl-test.jar output/
+cp -a $GLUEGEN/make/lib/junit.jar output/
+
diff --git a/test/TestMultiAndFatJar/run-fat.sh b/test/TestMultiAndFatJar/run-fat.sh
index 2108446..4b09ecb 100644
--- a/test/TestMultiAndFatJar/run-fat.sh
+++ b/test/TestMultiAndFatJar/run-fat.sh
@@ -1,9 +1,14 @@
+#! /bin/bash
 
-D_ARGS="-Djogamp.debug.JNILibLoader -Djogamp.debug.TempFileCache -Djogamp.debug.JarUtil -Djogamp.debug.TempJarCache -Djogamp.debug.IOUtil"
+#D_ARGS="-Djogamp.debug.JNILibLoader -Djogamp.debug.TempFileCache -Djogamp.debug.JarUtil -Djogamp.debug.TempJarCache -Djogamp.debug.IOUtil"
 #D_ARGS="-Djogamp.debug.ProcAddressHelper -Djogamp.debug.NativeLibrary -Djogamp.debug.NativeLibrary.Lookup"
 #D_ARGS="-Djogamp.debug.JNILibLoader -Djogamp.debug.TempFileCache -Djogamp.debug.JarUtil -Djogamp.debug.TempJarCache -Djogamp.debug.NativeLibrary -Djogamp.debug.NativeLibrary.Lookup -Djogl.debug=all"
 
 #T_CLASS="com.jogamp.opengl.JoglVersion"
-T_CLASS="com.jogamp.newt.opengl.GLWindow"
+#T_CLASS="com.jogamp.newt.opengl.GLWindow"
+T_CLASS="com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NEWT -time 2000"
 
-java -cp jogl-fat.jar $D_ARGS $T_CLASS 2>&1 | tee run-fat.log
+#
+# Just to run some tests: jogl-test.jar and junit.jar
+#
+java -cp output/jogl-fat.jar:output/jogl-test.jar:output/junit.jar $D_ARGS $T_CLASS 2>&1 | tee run-fat.log
diff --git a/test/TestMultiAndFatJar/run-multi.sh b/test/TestMultiAndFatJar/run-multi.sh
index 86206a4..0c31cac 100644
--- a/test/TestMultiAndFatJar/run-multi.sh
+++ b/test/TestMultiAndFatJar/run-multi.sh
@@ -1,9 +1,14 @@
+#! /bin/bash
 
-D_ARGS="-Djogamp.debug.JNILibLoader -Djogamp.debug.TempFileCache -Djogamp.debug.JarUtil -Djogamp.debug.TempJarCache -Djogamp.debug.IOUtil"
+#D_ARGS="-Djogamp.debug.JNILibLoader -Djogamp.debug.TempFileCache -Djogamp.debug.JarUtil -Djogamp.debug.TempJarCache -Djogamp.debug.IOUtil"
 #D_ARGS="-Djogamp.debug.ProcAddressHelper -Djogamp.debug.NativeLibrary -Djogamp.debug.NativeLibrary.Lookup"
 #D_ARGS="-Djogamp.debug.JNILibLoader -Djogamp.debug.TempFileCache -Djogamp.debug.JarUtil -Djogamp.debug.TempJarCache -Djogamp.debug.NativeLibrary -Djogamp.debug.IOUtil"
 
 #T_CLASS="com.jogamp.opengl.JoglVersion"
-T_CLASS="com.jogamp.newt.opengl.GLWindow"
+#T_CLASS="com.jogamp.newt.opengl.GLWindow"
+T_CLASS="com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NEWT -time 2000"
 
-java -cp jogl-multi.jar $D_ARGS $T_CLASS 2>&1 | tee run-multi.log
+#
+# Just to run some tests: jogl-test.jar and junit.jar
+#
+java -cp output/jogl-multi.jar:output/jogl-test.jar:output/junit.jar $D_ARGS $T_CLASS 2>&1 | tee run-multi.log
-- 
cgit v1.2.3