diff options
Diffstat (limited to 'make/scripts')
| -rwxr-xr-x | make/scripts/lstjars.sh | 12 | ||||
| -rw-r--r-- | make/scripts/tests-x64.bat | 2 | ||||
| -rw-r--r-- | make/scripts/tests.sh | 7 |
3 files changed, 11 insertions, 10 deletions
diff --git a/make/scripts/lstjars.sh b/make/scripts/lstjars.sh index 2a2f67bf2..a7710a280 100755 --- a/make/scripts/lstjars.sh +++ b/make/scripts/lstjars.sh @@ -7,15 +7,15 @@ shift BUILDDIR_GLUEGEN=$1 shift if [ -z "$BUILDDIR" -o -z "$BUILDDIR_GLUEGEN" ] ; then - echo "usage $0 <BUILDDIR-JOGL> <BUILDDIR-GLUEGEN> [-skippack200]" + echo "usage $0 <BUILDDIR-JOGL> <BUILDDIR-GLUEGEN> [-pack200]" exit 1 fi STATDIR=$BUILDDIR-stats -skippack200=0 -if [ "$1" = "-skippack200" ] ; then - skippack200=1 +pack200=0 +if [ "$1" = "-pack200" ] ; then + pack200=1 fi function report() { @@ -131,7 +131,7 @@ echo sort jogl*.lst | uniq -d mv nope/* . -mv jogl.test.lst *.cdc.lst *.all*.lst nope/ +mv jogl.test.lst *.cdc.lst *.all*.lst gluegen-gl.lst nope/ cat *.lst | sort -u > allparts.lst mv nope/* . cat *.all.lst gluegen-rt.lst | sort -u > allall.lst @@ -143,7 +143,7 @@ diff -Nur allparts.lst allall.lst listdeployment jar -if [ $skippack200 -eq 0 ] ; then +if [ $pack200 -eq 1 ] ; then for i in *.jar ; do fname=$i bname=$(basename $fname .jar) diff --git a/make/scripts/tests-x64.bat b/make/scripts/tests-x64.bat index 29feae682..d4aee05ce 100644 --- a/make/scripts/tests-x64.bat +++ b/make/scripts/tests-x64.bat @@ -1,4 +1,4 @@ -REM scripts\java-win64-dbg.bat com.jogamp.newt.impl.awt.opengl.VersionApplet +REM scripts\java-win64-dbg.bat jogamp.newt.awt.opengl.VersionApplet REM scripts\java-win64-dbg.bat com.jogamp.newt.opengl.GLWindow REM scripts\java-win64-dbg.bat javax.media.opengl.awt.GLCanvas REM scripts\java-win64-dbg.bat com.jogamp.opengl.test.junit.jogl.offscreen.TestOffscreen01GLPBufferNEWT -time 5000 diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh index e94d4223d..9a5e6fb20 100644 --- a/make/scripts/tests.sh +++ b/make/scripts/tests.sh @@ -38,7 +38,7 @@ function jrun() { #D_ARGS="-Dnewt.debug.EDT" #D_ARGS="-Djogl.debug=all -Dnativewindow.debug=all -Dnewt.debug=all" #D_ARGS="-Djogl.debug=all -Dnewt.debug=all" - D_ARGS="-Dnewt.debug.Window -Dnewt.debug.Display -Dnewt.debug.EDT -Djogl.debug.GLContext" + #D_ARGS="-Dnewt.debug.Window -Dnewt.debug.Display -Dnewt.debug.EDT -Djogl.debug.GLContext" #D_ARGS="-Dnewt.debug=all" #D_ARGS="-Dnativewindow.debug=all" #D_ARGS="-Djogl.debug.GraphicsConfiguration" @@ -96,7 +96,7 @@ function testawt() { # # awt (testawt) # -#testawt com.jogamp.newt.impl.awt.opengl.VersionApplet $* +#testawt jogamp.newt.awt.opengl.VersionApplet $* #testawt javax.media.opengl.awt.GLCanvas $* #testawt com.jogamp.opengl.test.junit.jogl.awt.TestAWT01GLn $* #testawt com.jogamp.opengl.test.junit.jogl.acore.TestSharedContextListAWT $* @@ -110,6 +110,7 @@ function testawt() { #testawt com.jogamp.opengl.test.junit.jogl.caps.TestMultisampleAWT #testawt com.jogamp.opengl.test.junit.jogl.swt.TestSWT01GLn #testawt com.jogamp.opengl.test.junit.jogl.awt.TestBug461OffscreenSupersamplingSwingAWT +testawt com.jogamp.opengl.test.junit.jogl.texture.TestGrayTextureFromFileAWTBug417 # # newt.awt (testawt) @@ -143,7 +144,7 @@ function testawt() { #testawt $* -testnoawt com.jogamp.opengl.test.junit.jogl.offscreen.TestOffscreen02BitmapNEWT +#testnoawt com.jogamp.opengl.test.junit.jogl.offscreen.TestOffscreen02BitmapNEWT $spath/count-edt-start.sh java-run.log |