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

fix openjdk and android builds when continuations=true

Browse Source 
Also, update the whitespace padding for printing test results to
accommodate long names like extra.ComposableContinuations.
This commit is contained in:
Joel Dice 2014-03-18 09:49:00 -06:00
parent fcb7059573
commit 570b5447bf
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
makefile
View File

@ -192,7 +192,7 @@ ifneq ($(android),)
crypto-native := $(android)/libcore/crypto/src/main/native
ifeq ($(platform),windows)
crypto-cpps := $(crypto-native)/org_conscrypt_NativeCrypto.cpp
crypto-cpps := $(crypto-native)/org_conscrypt_NativeCrypto.cpp
android-cflags += -D__STDC_CONSTANT_MACROS
blacklist = $(luni-native)/java_io_Console.cpp \
$(luni-native)/java_lang_ProcessManager.cpp \
@ -1337,6 +1337,8 @@ ifneq ($(classpath),avian)
$(classpath-src)/avian/ConstantPool.java \
$(classpath-src)/avian/Continuations.java \
$(classpath-src)/avian/FieldAddendum.java \
$(classpath-src)/avian/Function.java \
$(classpath-src)/avian/FunctionReceiver.java \
$(classpath-src)/avian/IncompatibleContinuationException.java \
$(classpath-src)/avian/Machine.java \
$(classpath-src)/avian/MethodAddendum.java \

6
test/test.sh
View File

@ -18,7 +18,7 @@ fi
echo -n "" >${log}
printf "%12s------- Unit tests -------\n" ""
printf "%20s------- Unit tests -------\n" ""
${unit_tester} 2>>${log}
if [ "${?}" != "0" ]; then
trouble=1
@ -27,9 +27,9 @@ fi
echo
printf "%12s------- Java tests -------\n" ""
printf "%20s------- Java tests -------\n" ""
for test in ${tests}; do
printf "%24s: " "${test}"
printf "%32s: " "${test}"
case ${mode} in
debug|debug-fast|fast|small )

4
unittest/test-harness.cpp
View File

@ -32,7 +32,7 @@ Test::Test(const char* name):
bool Test::runAll() {
int failures = 0;
for(Test* t = Test::first; t; t = t->next) {
printf("%24s: ", t->name);
printf("%32s: ", t->name);
t->run();
failures += t->failures;
if(t->failures > 0) {
@ -49,4 +49,4 @@ int main(int argc UNUSED, char** argv UNUSED) {
return 0;
}
return 1;
}
}