From 9cb1f1bb26f47a1fa6ffd3e9f5ee8bda7d6f726a Mon Sep 17 00:00:00 2001 From: Joshua Warner Date: Tue, 29 Apr 2014 14:14:44 -0600 Subject: [PATCH] Fix ci.sh tests on arm qemu systems There are two problems: * The x86 JIT compiler requires detectFeatures, defined in the x86 assembly. Thus it can't (currently) be built on non-x86 platforms. For the purposes of fixing test/ci.sh, it suffices to pretend codegen-targets=all means codegen-targets=native when on arm. * Qemu can introduce some extra latency which was regularly screwing up the LinkedBlockingQueueTest. Solution: increase the timeout to 1/10th seconds. --- makefile | 8 +++++++- test/LinkedBlockingQueueTest.java | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/makefile b/makefile index 932a2d03e4..dc9208c42c 100755 --- a/makefile +++ b/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) diff --git a/test/LinkedBlockingQueueTest.java b/test/LinkedBlockingQueueTest.java index 55052f36f8..f0eed44994 100644 --- a/test/LinkedBlockingQueueTest.java +++ b/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 {