diff options
author | Sven Gothel <[email protected]> | 2010-11-04 01:58:32 +0100 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2010-11-04 01:58:32 +0100 |
commit | 4d56491c3f8e76676e1c860d018bbe991d28ebac (patch) | |
tree | f5d9a7f61614b94ad3dd81fc55e323e2f9fed4e0 /make/scripts | |
parent | a0e9d6c8382b7275db6fae664be44db6b59671d5 (diff) |
Seperated unit tests (newt/awt/headless) and cleaned up some imports and comments
Seperated unit tests (newt/awt/headless)
- no more *CORE* tests
- junit.run.newt.headless: all NEWT headless (no-AWT) tests,
without any AWT classes and with -Djava.awt.headless=true.
Disabled for 'isOSX'.
- junit.run.newt: all NEWT non AWT tests (same as above),
but with full AWT. This test is not enabled via junit.run.
Disabled for 'isOSX'.
- junit.run.awt: all AWT tests without NEWT
- using newt.event.jar to add AWT agnostic NEWT event adapter
- junit.run.newt.awt: all NEWT + AWT tests
- junit.run: junit.run.newt.headless,junit.run.awt,junit.run.newt.awt
- swizzling around a few tests to achieve the above:
TEST rules:
- A runnable unit test must start with 'Test'
- Only pure NEWT tests must have 'NEWT' in their name
- AWT tests must have 'AWT' in their name.
- AWT + NEWT tests must have '.newt.' in their package name, hence
- Pure AWT tests (without NEWT) must not have '.newt.' in their package name
Diffstat (limited to 'make/scripts')
-rw-r--r-- | make/scripts/count-lock.sh | 17 | ||||
-rw-r--r-- | make/scripts/make-runtime-properties.sh | 59 | ||||
-rw-r--r-- | make/scripts/tests.bat | 5 | ||||
-rw-r--r--[-rwxr-xr-x] | make/scripts/tests.sh | 126 | ||||
-rw-r--r-- | make/scripts/tests2.sh | 84 |
5 files changed, 164 insertions, 127 deletions
diff --git a/make/scripts/count-lock.sh b/make/scripts/count-lock.sh new file mode 100644 index 000000000..806235f5c --- /dev/null +++ b/make/scripts/count-lock.sh @@ -0,0 +1,17 @@ + +echo lock +grep -RI "lock()" ../src/ | wc +echo unlock +grep -RI "unlock()" ../src/ | wc +echo +echo + +for i in `grep -RIl "unlock()" ../src/` ; do + echo $i + echo lock + grep -RI "lock()" $i | wc + echo unlock + grep -RI "unlock()" $i | wc + echo + echo +done diff --git a/make/scripts/make-runtime-properties.sh b/make/scripts/make-runtime-properties.sh new file mode 100644 index 000000000..f546a93ee --- /dev/null +++ b/make/scripts/make-runtime-properties.sh @@ -0,0 +1,59 @@ +#! /bin/bash + +dest0=../doc/Implementation +dest=../doc/Implementation/runtime-properties-temp + +rm -rf $dest +mkdir $dest + +function cleanup() { + tfile=$1 + shift + ffile=$1 + shift + domain=$1 + shift + + sed -e 's/^.*(\"//g' -i $tfile + sed -e 's/\".*$//g' -i $tfile + sed -e "s/^/$domain/g" -i $tfile + + sort -u $tfile > $ffile + rm -f $tfile +} + +grep -hRI "Debug\.debug" ../../gluegen/src/java/com/jogamp | sort -u > $dest/gluegen-rt.debug.tmp1.txt +cleanup $dest/gluegen-rt.debug.tmp1.txt $dest/gluegen-rt.debug.txt jogamp.debug. +grep -hRI -e "Debug\.isPropertyDefined" -e "Debug\.get" ../../gluegen/src/java/com/jogamp | sort -u > $dest/gluegen-rt.debug.ipd.tmp1.txt +cleanup $dest/gluegen-rt.debug.ipd.tmp1.txt $dest/gluegen-rt.ipd.debug.txt + +grep -hRI "Debug\.debug" ../src/nativewindow | sort -u > $dest/nativewindow.debug.tmp1.txt +cleanup $dest/nativewindow.debug.tmp1.txt $dest/nativewindow.debug.txt nativewindow.debug. +grep -hRI -e "Debug\.isPropertyDefined" -e "Debug\.get" ../src/nativewindow | sort -u > $dest/nativewindow.debug.ipd.tmp1.txt +cleanup $dest/nativewindow.debug.ipd.tmp1.txt $dest/nativewindow.ipd.debug.txt + +grep -hRI "Debug\.debug" ../src/jogl | sort -u > $dest/jogl.debug.all.tmp1.txt +cleanup $dest/jogl.debug.all.tmp1.txt $dest/jogl.debug.all.txt jogl.debug. +grep -hRI -e "Debug\.isPropertyDefined" -e "Debug\.get" ../src/jogl | sort -u > $dest/jogl.debug.ipd.tmp1.txt +cleanup $dest/jogl.debug.ipd.tmp1.txt $dest/jogl.ipd.debug.txt + +grep -hRI "Debug\.debug" ../src/newt | sort -u > $dest/newt.debug.tmp1.txt +cleanup $dest/newt.debug.tmp1.txt $dest/newt.debug.txt newt.debug. +grep -hRI -e "Debug\.isPropertyDefined" -e "Debug\.get" ../src/newt | sort -u > $dest/newt.debug.ipd.tmp1.txt +cleanup $dest/newt.debug.ipd.tmp1.txt $dest/newt.ipd.debug.txt + +function onefile() { + for i in $dest/* ; do + echo $i + echo ---------------------------------------- + sed 's/^/ /g' $i + echo + echo + echo + done +} + +onefile > $dest0/runtime-properties-new.txt + +rm -rf $dest + diff --git a/make/scripts/tests.bat b/make/scripts/tests.bat index 873f039a8..1f3014660 100644 --- a/make/scripts/tests.bat +++ b/make/scripts/tests.bat @@ -1,7 +1,8 @@ -REM scripts\java-win64-dbg.bat com.jogamp.test.junit.jogl.demos.gl2.gears.TestGearsNEWT -time 30000 +REM scripts\java-win64-dbg.bat com.jogamp.test.junit.jogl.demos.gl2.gears.newt.TestGearsNEWT -time 30000 REM scripts\java-win64-dbg.bat com.jogamp.test.junit.jogl.acore.TestGLProfile01CORE -REM scripts\java-win64-dbg.bat com.jogamp.test.junit.newt.TestParenting01AWT +REM scripts\java-win64-dbg.bat com.jogamp.test.junit.jogl.newt.TestSwingAWTRobotUsageBeforeJOGLInitBug411 +REM scripts\java-win64-dbg.bat com.jogamp.test.junit.newt.TestParenting01AWT REM scripts\java-win64-dbg.bat com.jogamp.test.junit.newt.parenting.TestParenting01cAWT -time 50000 REM scripts\java-win64-dbg.bat com.jogamp.test.junit.newt.TestListenerCom01AWT REM scripts\java-win64-dbg.bat com.jogamp.test.junit.newt.parenting.TestParenting01NEWT diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh index b7033d3e1..83c852584 100755..100644 --- a/make/scripts/tests.sh +++ b/make/scripts/tests.sh @@ -1,49 +1,93 @@ #! /bin/bash +bdir=../build-x86_64 + rm -f java-run.log spath=`dirname $0` -#com.jogamp.test.junit.newt.TestParenting01AWT - -# $spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.jogl.acore.TestGLProfile01NEWT $* - -# $spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.jogl.demos.gl2.gears.TestGearsAWT $* -# $spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.jogl.demos.gl2.gears.TestGearsNEWT $* -# $spath/java-run-all.sh ../build-x86_64 -Djava.awt.headless=true com.jogamp.test.junit.jogl.demos.gl2.gears.TestGearsNEWT $* - -# $spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.newt.TestDisplayLifecycle01NEWT $* - -# $spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.newt.TestListenerCom01AWT $* - -# $spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.newt.TestGLWindows01NEWT $* -# $spath/java-run-all.sh ../build-x86_64 -Djava.awt.headless=true com.jogamp.test.junit.newt.TestGLWindows01NEWT $* -# $spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.newt.TestGLWindows02NEWTAnimated $* - -# $spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.jogl.offscreen.TestOffscreen01NEWT $* - -# $spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.newt.parenting.TestParenting01NEWT $* -# $spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.newt.parenting.TestParenting02NEWT $* - -# $spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.newt.parenting.TestParenting01aAWT $* -# $spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.newt.parenting.TestParenting01bAWT $* -# $spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.newt.parenting.TestParenting01cAWT $* -# $spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.newt.parenting.TestParenting01cSwingAWT $* -# $spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.newt.parenting.TestParenting02AWT $* -# $spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.newt.parenting.TestParenting03AWT $* - -# $spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.jogl.awt.TestSwingAWTRobotUsageBeforeJOGLInitBug411 $* -# $spath/java-run-all.sh ../build-x86_64 -Dnativewindow.debug.ToolkitLock.TraceLock com.jogamp.test.junit.jogl.awt.TestSwingAWTRobotUsageBeforeJOGLInitBug411 $* - -# $spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.newt.TestFocus01SwingAWTRobot $* -# $spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.newt.TestFocus02SwingAWTRobot $* - -#$spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.newt.TestEventSourceNotAWTBug $* - -#$spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.newt.TestScreenMode01NEWT $* - -$spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.newt.TestScreenMode02NEWT $* - - +. $spath/setenv-jogl.sh $bdir JOGL_ALL + +which java 2>&1 | tee -a java-run.log +java -version 2>&1 | tee -a java-run.log +echo LIBXCB_ALLOW_SLOPPY_LOCK: $LIBXCB_ALLOW_SLOPPY_LOCK 2>&1 | tee -a java-run.log +echo LIBGL_DRIVERS_PATH: $LIBGL_DRIVERS_PATH 2>&1 | tee -a java-run.log +echo LIBGL_DEBUG: $LIBGL_DEBUG 2>&1 | tee -a java-run.log +echo java $X_ARGS $D_ARGS $* 2>&1 | tee -a java-run.log + +function jrun() { + awtarg=$1 + shift + # D_ARGS="-Djogamp.debug.TraceLock" + # D_ARGS="-Dnewt.debug.EDT -Dnativewindow.debug.ToolkitLock.TraceLock -Dnativewindow.debug.NativeWindow" + # D_ARGS="-Dnewt.debug.Window -Dnewt.debug.Display -Dnewt.debug.EDT" + # D_ARGS="-Dnewt.debug.EDT -Dnativewindow.debug.ToolkitLock.TraceLock -Dnativewindow.debug.X11Util.TraceDisplayLifecycle=true" + #D_ARGS="-Djogamp.common.utils.locks.Lock.timeout=600000 -Djogamp.debug.Lock -Djogamp.debug.Lock.TraceLock" + # D_ARGS="-Dnewt.debug.Window -Dnewt.debug.EDT -Dnewt.debug.Display " + #D_ARGS="-Dnewt.debug.EDT -Djogamp.common.utils.locks.Lock.timeout=600000 -Djogl.debug.Animator -Dnewt.debug.Display -Dnewt.debug.Screen" + #D_ARGS="-Dnewt.debug.EDT -Dnewt.debug.Display -Dnativewindow.debug.X11Util -Djogl.debug.GLDrawable -Djogl.debug.GLCanvas" + #D_ARGS="-Dnewt.debug.EDT -Djogl.debug.GLContext" + D_ARGS="-Dnewt.debug.Screen -Dnewt.debug.EDT -Djogamp.debug.Lock" + #D_ARGS="-Dnewt.debug.EDT" + #D_ARGS="-Dnewt.debug.EDT -Djogl.debug=all -Dnativewindow.debug=all" + # D_ARGS="-Djogl.debug=all" + X_ARGS="-Dsun.java2d.noddraw=true -Dsun.java2d.opengl=false" + java $awtarg $X_ARGS $D_ARGS $* 2>&1 | tee -a java-run.log +} + +function testnoawt() { + jrun -Djava.awt.headless=true $* +} + +function testawt() { + jrun -Djava.awt.headless=false $* +} + +# +# newt (testnoawt and testawt) +# +#testnoawt com.jogamp.test.junit.jogl.acore.TestGLProfile01NEWT $* +#testawt com.jogamp.test.junit.jogl.acore.TestGLProfile01NEWT $* +#testawt com.jogamp.test.junit.jogl.demos.gl2.gears.newt.TestGearsNEWT +#testawt com.jogamp.test.junit.newt.TestDisplayLifecycle01NEWT +#testawt com.jogamp.test.junit.newt.parenting.TestParenting01NEWT +#testawt com.jogamp.test.junit.newt.parenting.TestParenting02NEWT +#testawt com.jogamp.test.junit.newt.TestScreenMode00NEWT +testnoawt com.jogamp.test.junit.newt.TestScreenMode01NEWT +#testnoawt com.jogamp.test.junit.newt.TestScreenMode02NEWT +#testawt com.jogamp.test.junit.newt.TestGLWindows01NEWT +#testawt -Djava.awt.headless=true com.jogamp.test.junit.newt.TestGLWindows01NEWT +#testawt com.jogamp.test.junit.newt.TestGLWindows02NEWTAnimated + + +# +# awt (testawt) +# +#testawt com.jogamp.test.junit.jogl.awt.TestAWT01GLn $* +#testawt com.jogamp.test.junit.jogl.awt.TestAWT02WindowClosing +#testawt com.jogamp.test.junit.jogl.awt.TestSwingAWT01GLn +#testawt com.jogamp.test.junit.jogl.demos.gl2.gears.TestGearsAWT +#testawt com.jogamp.test.junit.jogl.texture.TestTexture01AWT + +# +# newt.awt (testawt) +# +#testawt com.jogamp.test.junit.jogl.newt.TestSwingAWTRobotUsageBeforeJOGLInitBug411 +#testawt com.jogamp.test.junit.jogl.demos.gl2.gears.newt.TestGearsNewtAWTWrapper +#testawt com.jogamp.test.junit.newt.TestEventSourceNotAWTBug +#testawt com.jogamp.test.junit.newt.TestFocus01SwingAWTRobot +#testawt com.jogamp.test.junit.newt.TestFocus02SwingAWTRobot +#testawt com.jogamp.test.junit.newt.TestListenerCom01AWT +#testawt com.jogamp.test.junit.newt.parenting.TestParenting01aAWT +#testawt com.jogamp.test.junit.newt.parenting.TestParenting01bAWT +#testawt com.jogamp.test.junit.newt.parenting.TestParenting01cAWT +#testawt com.jogamp.test.junit.newt.parenting.TestParenting01cSwingAWT +#testawt com.jogamp.test.junit.newt.parenting.TestParenting02AWT +#testawt com.jogamp.test.junit.newt.parenting.TestParenting03AWT +#testawt com.jogamp.test.junit.newt.parenting.TestParenting03AWT -time 100000 +#testawt com.jogamp.test.junit.newt.parenting.TestParenting03bAWT -time 100000 + +#testawt $* $spath/count-edt-start.sh java-run.log + diff --git a/make/scripts/tests2.sh b/make/scripts/tests2.sh deleted file mode 100644 index 9f143e60a..000000000 --- a/make/scripts/tests2.sh +++ /dev/null @@ -1,84 +0,0 @@ -#! /bin/bash - -bdir=../build-x86_64 - -rm -f java-run.log - -spath=`dirname $0` - -. $spath/setenv-jogl.sh $bdir JOGL_ALL - -which java 2>&1 | tee -a java-run.log -java -version 2>&1 | tee -a java-run.log -echo LIBXCB_ALLOW_SLOPPY_LOCK: $LIBXCB_ALLOW_SLOPPY_LOCK 2>&1 | tee -a java-run.log -echo LIBGL_DRIVERS_PATH: $LIBGL_DRIVERS_PATH 2>&1 | tee -a java-run.log -echo LIBGL_DEBUG: $LIBGL_DEBUG 2>&1 | tee -a java-run.log -echo java $X_ARGS $D_ARGS $* 2>&1 | tee -a java-run.log - -function jrun() { - awtarg=$1 - shift - # D_ARGS="-Djogamp.debug.TraceLock" - # D_ARGS="-Dnewt.debug.EDT -Dnativewindow.debug.ToolkitLock.TraceLock -Dnativewindow.debug.NativeWindow" - # D_ARGS="-Dnewt.debug.Window -Dnewt.debug.Display -Dnewt.debug.EDT" - # D_ARGS="-Dnewt.debug.EDT -Dnativewindow.debug.ToolkitLock.TraceLock -Dnativewindow.debug.X11Util.TraceDisplayLifecycle=true" - #D_ARGS="-Djogamp.common.utils.locks.Lock.timeout=600000 -Djogamp.debug.Lock -Djogamp.debug.Lock.TraceLock" - # D_ARGS="-Dnewt.debug.Window -Dnewt.debug.EDT -Dnewt.debug.Display " - #D_ARGS="-Dnewt.debug.EDT -Djogamp.common.utils.locks.Lock.timeout=600000 -Djogl.debug.Animator -Dnewt.debug.Display -Dnewt.debug.Screen" - #D_ARGS="-Dnewt.debug.EDT -Dnewt.debug.Display -Dnativewindow.debug.X11Util -Djogl.debug.GLDrawable -Djogl.debug.GLCanvas" - #D_ARGS="-Dnewt.debug.EDT -Djogl.debug.GLContext" - D_ARGS="-Dnewt.debug.Screen -Dnewt.debug.EDT -Djogamp.debug.Lock" - #D_ARGS="-Dnewt.debug.EDT" - #D_ARGS="-Dnewt.debug.EDT -Djogl.debug=all -Dnativewindow.debug=all" - # D_ARGS="-Djogl.debug=all" - X_ARGS="-Dsun.java2d.noddraw=true -Dsun.java2d.opengl=false" - java $awtarg $X_ARGS $D_ARGS $* 2>&1 | tee -a java-run.log -} - -function testnoawt() { - jrun -Djava.awt.headless=true $* -} - -function testawt() { - jrun -Djava.awt.headless=false $* -} - -#testnoawt com.jogamp.test.junit.jogl.acore.TestGLProfile01NEWT $* -#testawt com.jogamp.test.junit.jogl.acore.TestGLProfile01NEWT $* - -#testawt com.jogamp.test.junit.jogl.awt.TestAWT01GLn $* -#testawt com.jogamp.test.junit.jogl.awt.TestAWT02WindowClosing -#testawt com.jogamp.test.junit.jogl.awt.TestSwingAWT01GLn -#testawt com.jogamp.test.junit.jogl.awt.TestSwingAWTRobotUsageBeforeJOGLInitBug411 -#testawt com.jogamp.test.junit.jogl.demos.gl2.gears.TestGearsAWT -#testawt com.jogamp.test.junit.jogl.demos.gl2.gears.TestGearsNewtAWTWrapper -#testawt com.jogamp.test.junit.jogl.texture.TestTexture01AWT -#testawt com.jogamp.test.junit.newt.TestEventSourceNotAWTBug -#testawt com.jogamp.test.junit.newt.TestFocus01SwingAWTRobot -#testawt com.jogamp.test.junit.newt.TestFocus02SwingAWTRobot -#testawt com.jogamp.test.junit.newt.TestListenerCom01AWT -#testawt com.jogamp.test.junit.newt.parenting.TestParenting01aAWT -#testawt com.jogamp.test.junit.newt.parenting.TestParenting01bAWT -#testawt com.jogamp.test.junit.newt.parenting.TestParenting01cAWT -#testawt com.jogamp.test.junit.newt.parenting.TestParenting01cSwingAWT -#testawt com.jogamp.test.junit.newt.parenting.TestParenting02AWT -#testawt com.jogamp.test.junit.newt.parenting.TestParenting03AWT -#testawt com.jogamp.test.junit.newt.parenting.TestParenting03AWT -time 100000 -#testawt com.jogamp.test.junit.newt.parenting.TestParenting03bAWT -time 100000 -#testawt com.jogamp.test.junit.core.TestIteratorIndexCORE - -#testawt com.jogamp.test.junit.newt.TestDisplayLifecycle01NEWT -#testawt com.jogamp.test.junit.newt.parenting.TestParenting01NEWT -#testawt com.jogamp.test.junit.newt.parenting.TestParenting02NEWT - -#testawt com.jogamp.test.junit.newt.TestScreenMode00NEWT -testnoawt com.jogamp.test.junit.newt.TestScreenMode01NEWT -#testnoawt com.jogamp.test.junit.newt.TestScreenMode02NEWT - -#testawt com.jogamp.test.junit.newt.TestGLWindows01NEWT -#testawt -Djava.awt.headless=true com.jogamp.test.junit.newt.TestGLWindows01NEWT -#testawt com.jogamp.test.junit.newt.TestGLWindows02NEWTAnimated - -#testawt $* - -$spath/count-edt-start.sh java-run.log |