diff options
| author | Rami Santina <[email protected]> | 2010-10-21 12:34:51 +0300 |
|---|---|---|
| committer | Rami Santina <[email protected]> | 2010-10-21 12:34:51 +0300 |
| commit | 9efc951e53c41e21a0c8bfed6dcc22762d9b413c (patch) | |
| tree | aa580de9a7848bbc0b0aa132f2904cbb399c34e2 /make | |
| parent | 29891baca2427483f96e6d1a8c3b13892ba5facc (diff) | |
| parent | 18bf27fa86da1f26fd085565f501736816d2f2e9 (diff) | |
Merge branch 'master' of http://github.com/sgothel/jogl
18bf27fa86da1f26fd085565f501736816d2f2e9
Conflicts resolved:
src/newt/classes/com/jogamp/newt/impl/WindowImpl.java
src/newt/classes/com/jogamp/newt/impl/windows/WindowsWindow.java
src/newt/classes/com/jogamp/newt/impl/x11/X11Window.java
src/newt/native/WindowsWindow.c
src/newt/native/X11Window.c
Diffstat (limited to 'make')
| -rwxr-xr-x | make/scripts/check-junit.sh | 27 | ||||
| -rwxr-xr-x | make/scripts/java-win64-dbg.bat | 3 | ||||
| -rw-r--r-- | make/scripts/tests.bat | 11 |
3 files changed, 36 insertions, 5 deletions
diff --git a/make/scripts/check-junit.sh b/make/scripts/check-junit.sh new file mode 100755 index 000000000..1b1ba7875 --- /dev/null +++ b/make/scripts/check-junit.sh @@ -0,0 +1,27 @@ +#! /bin/bash + +builddir=$1 +shift + +echo number of junit classes +grep failures $builddir/test/results/* | wc +echo +echo number of passed junit classes - failures +grep failures $builddir/test/results/* | grep "failures=\"0\"" | wc +echo +echo number of passed junit classes - errors +grep failures $builddir/test/results/* | grep "errors=\"0\"" | wc +echo +echo number of failed junit classes - failures +grep failures $builddir/test/results/* | grep -v "failures=\"0\"" | wc +echo +echo number of failed junit classes - errors +grep failures $builddir/test/results/* | grep -v "errors=\"0\"" | wc +echo +echo failed junit classes - failures +grep failures $builddir/test/results/* | grep -v "failures=\"0\"" +echo +echo failed junit classes - errors +grep failures $builddir/test/results/* | grep -v "errors=\"0\"" +echo + diff --git a/make/scripts/java-win64-dbg.bat b/make/scripts/java-win64-dbg.bat index 212fc5fa5..57281d6fd 100755 --- a/make/scripts/java-win64-dbg.bat +++ b/make/scripts/java-win64-dbg.bat @@ -14,10 +14,11 @@ set CP_ALL=.;%BLD_DIR%\jogl\jogl.all.jar;%BLD_DIR%\nativewindow\nativewindow.all echo CP_ALL %CP_ALL%
REM set D_ARGS="-Djogamp.debug.JNILibLoader=true" "-Djogamp.debug.NativeLibrary=true" "-Djogamp.debug.NativeLibrary.Lookup=true" "-Djogl.debug.GLProfile=true"
-set D_ARGS="-Djogl.debug=all" "-Dnewt.debug=all" "-Dnativewindow.debug=all" "-Djogamp.debug.Lock" "-Djogamp.debug.Lock.TraceLock"
+REM set D_ARGS="-Djogl.debug=all" "-Dnewt.debug=all" "-Dnativewindow.debug=all" "-Djogamp.debug.Lock" "-Djogamp.debug.Lock.TraceLock"
REM set D_ARGS="-Dnewt.debug.Window" "-Dnativewindow.debug.TraceLock"
REM set D_ARGS="-Dnativewindow.debug.TraceLock"
REM set D_ARGS="-Dnewt.debug.Window" "-Dnewt.debug.Display"
+set D_ARGS="-Dnewt.debug.Window" "-Dnewt.debug.EDT" "-Dnativewindow.debug=all" "-Djogamp.common.utils.locks.Lock.timeout=600000" "-Djogamp.debug.Lock" "-Djogamp.debug.Lock.TraceLock"
REM set D_ARGS="-Dnewt.debug.Window" "-Dnewt.debug.Display" "-Dnewt.test.Window.reparent.incompatible=true"
set X_ARGS="-Dsun.java2d.noddraw=true" "-Dsun.awt.noerasebackground=true"
diff --git a/make/scripts/tests.bat b/make/scripts/tests.bat index 280278f77..4049fc278 100644 --- a/make/scripts/tests.bat +++ b/make/scripts/tests.bat @@ -3,7 +3,6 @@ REM scripts\java-win64-dbg.bat com.jogamp.test.junit.jogl.acore.TestGLProfile01C 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.TestDisplayLifecycle01NEWT 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 @@ -13,8 +12,12 @@ REM scripts\java-win64-dbg.bat com.jogamp.test.junit.newt.parenting.TestParentin REM scripts\java-win64-dbg.bat com.jogamp.test.junit.newt.TestFocus02SwingAWTRobot REM scripts\java-win64-dbg.bat com.jogamp.test.junit.newt.TestFocus01SwingAWTRobot REM scripts\java-win64-dbg.bat com.jogamp.test.junit.nativewindow.TestRecursiveToolkitLockCORE -REM scripts\java-win64-dbg.bat com.jogamp.test.junit.newt.parenting.TestParenting03AWT +REM scripts\java-win64-dbg.bat com.jogamp.test.junit.newt.parenting.TestParenting03AWT -time 100000 REM scripts\java-win64.bat com.jogamp.test.junit.newt.TestFocus02SwingAWTRobot -scripts\java-win64.bat com.jogamp.test.junit.newt.TestScreenMode01NEWT -REM scripts\java-win64.bat com.jogamp.test.junit.newt.TestScreenMode02NEWT +REM scripts\java-win64.bat com.jogamp.test.junit.newt.TestScreenMode01NEWT +scripts\java-win64.bat com.jogamp.test.junit.newt.TestScreenMode02NEWT + +REM scripts\java-win64-dbg.bat com.jogamp.test.junit.newt.TestDisplayLifecycle01NEWT +REM scripts\java-win64-dbg.bat com.jogamp.test.junit.newt.parenting.TestParenting01NEWT +REM scripts\java-win64-dbg.bat com.jogamp.test.junit.newt.parenting.TestParenting02NEWT |