diff options
Diffstat (limited to 'make/scripts')
-rwxr-xr-x | make/scripts/junit-linux-armv6hf-console.sh (renamed from make/scripts/junit-linux-armv6hf-headless.sh) | 7 | ||||
-rwxr-xr-x | make/scripts/junit-linux-x86_64-console.sh (renamed from make/scripts/junit-linux-x86_64-headless.sh) | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/make/scripts/junit-linux-armv6hf-headless.sh b/make/scripts/junit-linux-armv6hf-console.sh index 3561d5b82..e9379e9f9 100755 --- a/make/scripts/junit-linux-armv6hf-headless.sh +++ b/make/scripts/junit-linux-armv6hf-console.sh @@ -6,7 +6,7 @@ if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh ] ; then . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh fi -LOGF=junit.jogl.all.linux-armv6hf-headless.log +LOGF=junit.jogl.all.linux-armv6hf-console.log rm -f $LOGF export GLUEGEN_CPPTASKS_FILE="../../gluegen/make/lib/gluegen-cpptasks-linux-armv6hf.xml" @@ -18,6 +18,9 @@ export TARGET_RT_JAR=/opt-share/jre1.8.0_212/lib/rt.jar #export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org" export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet" +#TARGET=junit.run +TARGET=junit.run.console + # BUILD_ARCHIVE=true \ ant \ -Dsetup.noAWT=true \ @@ -27,5 +30,5 @@ ant \ -Dsetup.addNativeKD=true \ -Dsetup.addNativeOpenMAX=true \ -Dsetup.addNativeBroadcom=true \ - junit.run 2>&1 | tee -a $LOGF + $TARGET 2>&1 | tee -a $LOGF diff --git a/make/scripts/junit-linux-x86_64-headless.sh b/make/scripts/junit-linux-x86_64-console.sh index 561043c49..076c3a088 100755 --- a/make/scripts/junit-linux-x86_64-headless.sh +++ b/make/scripts/junit-linux-x86_64-console.sh @@ -6,7 +6,7 @@ if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh ] ; then . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh fi -LOGF=junit.jogl.all.linux-x86_64-headless.log +LOGF=junit.jogl.all.linux-x86_64-console.log rm -f $LOGF export SOURCE_LEVEL=1.8 @@ -16,11 +16,14 @@ export TARGET_RT_JAR=/opt-share/jre1.8.0_212/lib/rt.jar #export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org" export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet" +#TARGET=junit.run +TARGET=junit.run.console + # BUILD_ARCHIVE=true \ ant \ -Dsetup.noAWT=true \ -Dsetup.noSWT=true \ -Drootrel.build=build-x86_64 \ -Djunit.run.arg0="--illegal-access=warn" \ - junit.run 2>&1 | tee -a $LOGF + $TARGET 2>&1 | tee -a $LOGF |