SWTEDTUtil/AWTEDTUtil: Fix deadlock situations ; Cleanup TestNewtCanvasSWTBug628ResizeDeadlock

- Fix deadlock situation in waitUntilStopped/Idle(), skip if on AWT/SWT EDT

- Use RunnableTask for sync task invocation, don't block AWT/SWT EDT.

- Cleanup TestNewtCanvasSWTBug628ResizeDeadlock (works on OSX as well)

5 files changed, 18 insertions, 3 deletions

diff --git a/make/scripts/make.jogl.all.win64.bat b/make/scripts/make.jogl.all.win64.bat
index 7355c6a1a..e2b3a6b80 100755
--- a/make/scripts/make.jogl.all.win64.bat
+++ b/make/scripts/make.jogl.all.win64.bat
@@ -6,8 +6,8 @@ set ANT_PATH=C:\apache-ant-1.8.2
 

 set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw64\bin;%PATH%

 

-set LIB_GEN=%THISDIR%\lib

-set CLASSPATH=.;%THISDIR%\build-win64\classes

+REM set LIB_GEN=%THISDIR%\lib

+REM set CLASSPATH=.;%THISDIR%\build-win64\classes

 REM    -Dc.compiler.debug=true 

 REM    -Dsetup.addNativeOpenMAX=true 

 REM    -Dsetup.addNativeKD=true

diff --git a/make/scripts/tests-x64-junit-swt.sh b/make/scripts/tests-linux-x64-junit-swt.sh
index 421791a19..421791a19 100644
--- a/make/scripts/tests-x64-junit-swt.sh
+++ b/make/scripts/tests-linux-x64-junit-swt.sh
diff --git a/make/scripts/tests-macosx64-junit-swt.sh b/make/scripts/tests-macosx64-junit-swt.sh
new file mode 100644
index 000000000..2a6ccd63a
--- /dev/null
+++ b/make/scripts/tests-macosx64-junit-swt.sh
@@ -0,0 +1,7 @@
+#! /bin/bash
+
+SDIR=`dirname $0` 
+
+. $SDIR/make.jogl.all.macosx.sh -f build-test.xml junit.run.settings junit.run.swt.awt
+
+
diff --git a/make/scripts/tests-win64-junit-swt.bat b/make/scripts/tests-win64-junit-swt.bat
new file mode 100755
index 000000000..fbcc5d692
--- /dev/null
+++ b/make/scripts/tests-win64-junit-swt.bat
@@ -0,0 +1,7 @@
+set THISDIR=%cd%
+
+set SDIR=%~dp0%
+
+%SDIR%/make.jogl.all.win64.bat -f build-test.xml junit.run.settings junit.run.swt.awt
+
+
diff --git a/make/scripts/tests-x64.bat b/make/scripts/tests-x64.bat
index 7dd00eabe..0266f2bb7 100755
--- a/make/scripts/tests-x64.bat
+++ b/make/scripts/tests-x64.bat
@@ -56,6 +56,7 @@ REM scripts\java-win64-dbg.bat com.jogamp.opengl.test.junit.newt.parenting.TestP
 REM scripts\java-win64-dbg.bat com.jogamp.opengl.test.junit.jogl.swt.TestSWTAccessor03AWTGLn %*
 REM scripts\java-win64-dbg.bat com.jogamp.opengl.test.junit.jogl.swt.TestSWTJOGLGLCanvas01GLn %*
 REM scripts\java-win64-dbg.bat com.jogamp.opengl.test.junit.jogl.swt.TestNewtCanvasSWTGLn %*
+scripts\java-win64-dbg.bat com.jogamp.opengl.test.junit.jogl.swt.TestNewtCanvasSWTBug628ResizeDeadlock %*
 
 REM scripts\java-win64-dbg.bat com.jogamp.opengl.test.junit.newt.TestWindows01NEWT
 REM scripts\java-win64-dbg.bat com.jogamp.opengl.test.junit.newt.TestGLWindows01NEWT
@@ -112,7 +113,7 @@ REM scripts\java-win64.bat com.jogamp.opengl.test.junit.jogl.acore.TestGPUMemSec
 REM scripts\java-win64-dbg.bat com.jogamp.opengl.test.junit.jogl.acore.TestGPUMemSec01NEWT %*
 REM scripts\java-win64.bat com.jogamp.opengl.test.junit.jogl.acore.TestMapBuffer01NEWT
 
-scripts\java-win64-dbg.bat com.jogamp.opengl.test.junit.jogl.acore.TestGLAutoDrawableDelegateOnOffscrnCapsNEWT $*
+REM scripts\java-win64-dbg.bat com.jogamp.opengl.test.junit.jogl.acore.TestGLAutoDrawableDelegateOnOffscrnCapsNEWT $*
 REM scripts\java-win64.bat com.jogamp.opengl.test.junit.jogl.acore.TestGLAutoDrawableGLWindowOnOffscrnCapsNEWT $*
 REM scripts\java-win64.bat com.jogamp.opengl.test.junit.jogl.acore.TestGLAutoDrawableGLCanvasOnOffscrnCapsAWT $*
 REM scripts\java-win64.bat com.jogamp.opengl.test.junit.jogl.acore.TestGLAutoDrawableFactoryOffscrnCapsNEWT $*