ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-22 04:18:31 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #250 from joshuawarner32/fix-tests

Browse Source 
Fix ci.sh tests on arm qemu systems
This commit is contained in:
Joel Dice 2014-04-30 08:01:56 -06:00
commit 6cecfe81d0
3 changed files with 22 additions and 8 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) vm-sources += $(native-assembler-sources)
endif endif
ifeq ($(codegen-targets),all) 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 endif
vm-asm-sources += $(src)/compile-$(asm).$(asm-format) vm-asm-sources += $(src)/compile-$(asm).$(asm-format)

2
test/LinkedBlockingQueueTest.java
View File

@ -157,7 +157,7 @@ public class LinkedBlockingQueueTest {
}).start(); }).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 { private static void takeTest() throws InterruptedException {

20
test/ci.sh
View File

@ -2,13 +2,21 @@
set -e set -e
make ${flags} jdk-test if [ -z "${test_target}" ]; then
make ${flags} test test_target=test
make ${flags} mode=debug test fi
make ${flags} process=interpret test
# 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: # bootimage and openjdk builds without openjdk-src don't work:
if [ -z "${openjdk}" ]; then if [ -z "${openjdk}" ]; then
make ${flags} bootimage=true test make ${flags} bootimage=true ${test_target}
fi fi
make ${flags} tails=true continuations=true test make ${flags} tails=true continuations=true ${test_target}
make ${flags} codegen-targets=all make ${flags} codegen-targets=all