diff options
| author | Sven Gothel <[email protected]> | 2011-08-30 19:35:42 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2011-08-30 19:35:42 +0200 |
| commit | 7df34910488d930123cb5fd09f3075f6599bc98e (patch) | |
| tree | 301af980dce3e163045412cc9fe350a4e8ac2524 | |
| parent | 5a7811ecd23a3ab1af62b243c82d362431793a57 (diff) | |
Cont w/ 5a7811ecd23a3ab1af62b243c82d362431793a57: test-x*.sh
| -rwxr-xr-x | make/scripts/tests-x32.sh | 8 | ||||
| -rwxr-xr-x | make/scripts/tests-x64.sh | 7 |
2 files changed, 11 insertions, 4 deletions
diff --git a/make/scripts/tests-x32.sh b/make/scripts/tests-x32.sh index edbab5ac6..8ac1dc51b 100755 --- a/make/scripts/tests-x32.sh +++ b/make/scripts/tests-x32.sh @@ -1,7 +1,11 @@ #! /bin/bash -spath=`dirname $0` +SDIR=`dirname $0` -. $spath/tests.sh /opt-linux-x86/j2se6/bin/java ../build-x86 $* +if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86.sh ] ; then + . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86.sh +fi + +. $SDIR/tests.sh `which java` ../build-x86 $* diff --git a/make/scripts/tests-x64.sh b/make/scripts/tests-x64.sh index 48c71c5d1..1816f59f9 100755 --- a/make/scripts/tests-x64.sh +++ b/make/scripts/tests-x64.sh @@ -1,7 +1,10 @@ #! /bin/bash -spath=`dirname $0` +SDIR=`dirname $0` -. $spath/tests.sh /opt-linux-x86_64/j2se6/bin/java ../build-x86_64 $* +if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh ] ; then + . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh +fi +. $SDIR/tests.sh `which java` ../build-x86_64 $* |