diff options
6 files changed, 9 insertions, 9 deletions
diff --git a/make/build-test.xml b/make/build-test.xml index a30a105..ef228c6 100644 --- a/make/build-test.xml +++ b/make/build-test.xml @@ -235,7 +235,7 @@ <for param="test.class.path.m" keepgoing="true"> <!-- results in absolute path --> <fileset dir="${build_t.java}"> - <include name="${test.junit.rel}/**/Test*"/> + <include name="${test.junit.rel}/**/*Test*"/> <exclude name="**/*$$*"/> </fileset> <sequential> diff --git a/src/junit/com/jogamp/common/util/IntIntHashMapTest.java b/src/junit/com/jogamp/common/util/IntIntHashMapTest.java index 22ff25a..ab348a3 100644 --- a/src/junit/com/jogamp/common/util/IntIntHashMapTest.java +++ b/src/junit/com/jogamp/common/util/IntIntHashMapTest.java @@ -55,7 +55,7 @@ public class IntIntHashMapTest { @BeforeClass public static void init() { - iterations = ( Platform.getCPUType().getFamily() == Platform.CPUFamily.ARM ) ? 100 : 10000; + iterations = ( Platform.getCPUType().getFamily() == Platform.CPUFamily.ARM ) ? 20 : 10000; pairs = new IntIntUniqueRndValues(iterations); } diff --git a/src/junit/com/jogamp/common/util/IntObjectHashMapTest.java b/src/junit/com/jogamp/common/util/IntObjectHashMapTest.java index 2bbce8b..d0429e8 100644 --- a/src/junit/com/jogamp/common/util/IntObjectHashMapTest.java +++ b/src/junit/com/jogamp/common/util/IntObjectHashMapTest.java @@ -54,7 +54,7 @@ public class IntObjectHashMapTest { @BeforeClass public static void init() { - iterations = ( Platform.getCPUType().getFamily() == Platform.CPUFamily.ARM ) ? 100 : 10000; + iterations = ( Platform.getCPUType().getFamily() == Platform.CPUFamily.ARM ) ? 20 : 10000; pairs = new IntIntObjUniqueRndValues(iterations); } diff --git a/src/junit/com/jogamp/common/util/LongIntHashMapTest.java b/src/junit/com/jogamp/common/util/LongIntHashMapTest.java index 2426526..9558065 100644 --- a/src/junit/com/jogamp/common/util/LongIntHashMapTest.java +++ b/src/junit/com/jogamp/common/util/LongIntHashMapTest.java @@ -55,7 +55,7 @@ public class LongIntHashMapTest { @BeforeClass public static void init() { - iterations = ( Platform.getCPUFamily() == Platform.CPUFamily.ARM ) ? 100 : 10000; + iterations = ( Platform.getCPUFamily() == Platform.CPUFamily.ARM ) ? 20 : 10000; pairs = new LongIntUniqueRndValues(iterations); } diff --git a/src/junit/com/jogamp/common/util/TestIteratorIndexCORE.java b/src/junit/com/jogamp/common/util/TestIteratorIndexCORE.java index 6bdfbd1..20eee3f 100644 --- a/src/junit/com/jogamp/common/util/TestIteratorIndexCORE.java +++ b/src/junit/com/jogamp/common/util/TestIteratorIndexCORE.java @@ -42,7 +42,7 @@ import com.jogamp.common.os.Platform; public class TestIteratorIndexCORE { static int elems = 10; - static int loop = ( Platform.getCPUFamily() == Platform.CPUFamily.ARM ) ? 100 : 9999999; + static int loop = ( Platform.getCPUFamily() == Platform.CPUFamily.ARM ) ? 20 : 9999999; public void populate(List l, int len) { while(len>0) { diff --git a/src/junit/com/jogamp/common/util/locks/TestRecursiveLock01.java b/src/junit/com/jogamp/common/util/locks/TestRecursiveLock01.java index 099f8b8..96282f4 100644 --- a/src/junit/com/jogamp/common/util/locks/TestRecursiveLock01.java +++ b/src/junit/com/jogamp/common/util/locks/TestRecursiveLock01.java @@ -213,7 +213,7 @@ public class TestRecursiveLock01 { public void testLockedObjectThreading2x10000() throws InterruptedException { System.err.println("++++ TestRecursiveLock01.testLockedObjectThreading2x10000"); if( Platform.getCPUFamily() == Platform.CPUFamily.ARM ) { - testLockedObjectImpl(2, 10, 10, YIELD_NONE); + testLockedObjectImpl(2, 5, 10, YIELD_NONE); } else { testLockedObjectImpl(2, 10000, 10000, YIELD_NONE); } @@ -224,7 +224,7 @@ public class TestRecursiveLock01 { public void testLockedObjectThreading25x25Yield() throws InterruptedException { System.err.println("++++ TestRecursiveLock01.testLockedObjectThreading25x25-Yield"); if( Platform.getCPUFamily() == Platform.CPUFamily.ARM ) { - testLockedObjectImpl(5, 25, 10, YIELD_YIELD); + testLockedObjectImpl(2, 5, 10, YIELD_YIELD); } else { testLockedObjectImpl(25, 25, 100, YIELD_YIELD); } @@ -235,7 +235,7 @@ public class TestRecursiveLock01 { public void testLockedObjectThreading25x25Sleep() throws InterruptedException { System.err.println("++++ TestRecursiveLock01.testLockedObjectThreading25x25-Sleep"); if( Platform.getCPUFamily() == Platform.CPUFamily.ARM ) { - testLockedObjectImpl(5, 25, 10, YIELD_SLEEP); + testLockedObjectImpl(2, 5, 10, YIELD_SLEEP); } else { testLockedObjectImpl(25, 25, 100, YIELD_SLEEP); } @@ -246,7 +246,7 @@ public class TestRecursiveLock01 { public void testLockedObjectThreading25x25None() throws InterruptedException { System.err.println("++++ TestRecursiveLock01.testLockedObjectThreading25x25-None"); if( Platform.getCPUFamily() == Platform.CPUFamily.ARM ) { - testLockedObjectImpl(5, 25, 10, YIELD_NONE); + testLockedObjectImpl(2, 5, 10, YIELD_NONE); } else { testLockedObjectImpl(25, 25, 100, YIELD_NONE); } |