diff options
Diffstat (limited to 'src/test/com/jogamp')
| -rw-r--r-- | src/test/com/jogamp/opengl/test/junit/jogl/acore/TestInitConcurrent01NEWT.java | 12 | ||||
| -rw-r--r-- | src/test/com/jogamp/opengl/test/junit/jogl/acore/TestInitConcurrent02NEWT.java | 12 |
2 files changed, 18 insertions, 6 deletions
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestInitConcurrent01NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestInitConcurrent01NEWT.java index e5ed8a79f..719d1fc9d 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestInitConcurrent01NEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestInitConcurrent01NEWT.java @@ -42,6 +42,7 @@ import com.jogamp.common.os.Platform; * </p> */ public class TestInitConcurrent01NEWT extends InitConcurrentBaseNEWT { + static boolean mainRun = false; @Test public void test02TwoThreads() throws InterruptedException { @@ -55,16 +56,21 @@ public class TestInitConcurrent01NEWT extends InitConcurrentBaseNEWT { @Test public void test16SixteenThreads() throws InterruptedException { - if( Platform.getCPUFamily() != Platform.CPUFamily.ARM ) { + if( !mainRun && + Platform.getCPUFamily() != Platform.CPUFamily.ARM && + Platform.getOSType() != Platform.OSType.WINDOWS ) { runJOGLTasks(16, true); } else { - runJOGLTasks( 8, true); + runJOGLTasks( 6, true); } } public static void main(String args[]) throws IOException { + mainRun = true; for(int i=0; i<args.length; i++) { - if(args[i].equals("-time")) { + if(args[i].equals("-normalRun")) { + mainRun = false; + } else if(args[i].equals("-time")) { i++; try { duration = Integer.parseInt(args[i]); diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestInitConcurrent02NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestInitConcurrent02NEWT.java index 51e9af00e..fab427a45 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestInitConcurrent02NEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestInitConcurrent02NEWT.java @@ -42,6 +42,7 @@ import com.jogamp.common.os.Platform; * </p> */ public class TestInitConcurrent02NEWT extends InitConcurrentBaseNEWT { + static boolean mainRun = false; @Test public void test02TwoThreads() throws InterruptedException { @@ -55,16 +56,21 @@ public class TestInitConcurrent02NEWT extends InitConcurrentBaseNEWT { @Test public void test16SixteenThreads() throws InterruptedException { - if( Platform.getCPUFamily() != Platform.CPUFamily.ARM ) { + if( !mainRun && + Platform.getCPUFamily() != Platform.CPUFamily.ARM && + Platform.getOSType() != Platform.OSType.WINDOWS ) { runJOGLTasks(16, false); } else { - runJOGLTasks( 8, false); + runJOGLTasks( 6, false); } } public static void main(String args[]) throws IOException { + mainRun = true; for(int i=0; i<args.length; i++) { - if(args[i].equals("-time")) { + if(args[i].equals("-normalRun")) { + mainRun = false; + } else if(args[i].equals("-time")) { i++; try { duration = Integer.parseInt(args[i]); |