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/scripts/tests.bat | |
| 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/scripts/tests.bat')
| -rw-r--r-- | make/scripts/tests.bat | 11 |
1 files changed, 7 insertions, 4 deletions
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 |