ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-17 02:09:50 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix ci.sh tests on arm qemu systems

Browse Source 
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.
This commit is contained in:
Joshua Warner 2014-04-29 14:14:44 -06:00
parent 32d25d79fd
commit 9cb1f1bb26
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
makefile
View File

@ -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)

2
test/LinkedBlockingQueueTest.java
View File

@ -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 {