Merge pull request #250 from joshuawarner32/fix-tests

Fix ci.sh tests on arm qemu systems

makefile

@@ -1173,7 +1173,13 @@ ifeq ($(process),compile)
 		vm-sources += $(native-assembler-sources)
 	endif
 	ifeq ($(codegen-targets),all)
-		vm-sources += $(all-assembler-sources)
+		ifeq ($(arch),arm)
+			# The x86 jit has a dependency on the x86 assembly code,
+			# and thus can't be successfully built on non-x86 platforms.
+			vm-sources += $(native-assembler-sources)
+		else
+			vm-sources += $(all-assembler-sources)
+		endif
 	endif
 
 	vm-asm-sources += $(src)/compile-$(asm).$(asm-format)

test/LinkedBlockingQueueTest.java

@@ -157,7 +157,7 @@ public class LinkedBlockingQueueTest {
     }).start();
 
     
-    verify(lbq.poll(DELAY_TILL_ACTION * 2, TimeUnit.MILLISECONDS) == testObject);
+    verify(lbq.poll(DELAY_TILL_ACTION * 10, TimeUnit.MILLISECONDS) == testObject);
   }
   
   private static void takeTest() throws InterruptedException {

test/ci.sh

@@ -2,13 +2,21 @@
 
 set -e
 
-make ${flags} jdk-test
-make ${flags} test
-make ${flags} mode=debug test
-make ${flags} process=interpret test
+if [ -z "${test_target}" ]; then
+  test_target=test
+fi
+
+# we shouldn't run jdk-test builds if we're not running the test target
+if [ ${test_target} = test ]; then
+  make ${flags} jdk-test
+fi
+
+make ${flags} ${test_target}
+make ${flags} mode=debug ${test_target}
+make ${flags} process=interpret ${test_target}
 # bootimage and openjdk builds without openjdk-src don't work:
 if [ -z "${openjdk}" ]; then
-  make ${flags} bootimage=true test
+  make ${flags} bootimage=true ${test_target}
 fi
-make ${flags} tails=true continuations=true test
+make ${flags} tails=true continuations=true ${test_target}
 make ${flags} codegen-targets=all