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 jdk-test failures

Browse Source
This commit is contained in:
Joshua Warner 2013-12-06 19:30:04 -07:00
parent 47a7732a81
commit 0a4eff33b2
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
makefile
View File

@ -1452,7 +1452,7 @@ else
endif
.PHONY: jdk-test
jdk-test: $(test-dep) $(build)/jdk-run-tests.sh $(build)/test.sh
jdk-test: $(test-dep) $(build)/classpath.jar $(build)/jdk-run-tests.sh $(build)/test.sh
/bin/sh $(build)/jdk-run-tests.sh
PHONY: audit-baseline
@ -1502,7 +1502,7 @@ $(build)/run-tests.sh: $(test-classes) makefile $(build)/extra-dir/multi-classpa
$(build)/jdk-run-tests.sh: $(test-classes) makefile $(build)/extra-dir/multi-classpath-test.txt $(build)/test/multi-classpath-test.txt
echo 'cd $$(dirname $$0)' > $(@)
echo "sh ./test.sh 2>/dev/null \\" >> $(@)
echo "$(shell echo $(library-path) | sed 's|$(build)|\.|g') /bin/true $(JAVA_HOME)/bin/java $(mode) \"-Djava.library.path=. -cp test:extra-dir:classpath\" \\" >> $(@)
echo "'' true $(JAVA_HOME)/bin/java $(mode) \"-Xmx128m -Djava.library.path=. -cp test:extra-dir:classpath\" \\" >> $(@)
echo "$(call class-names,$(test-build),$(filter-out $(test-support-classes), $(test-classes))) \\" >> $(@)
echo "$(continuation-tests) $(tail-tests)" >> $(@)

7
test/LazyLoading.java
View File

@ -3,9 +3,9 @@ import java.io.FileInputStream;
import java.io.IOException;
public class LazyLoading {
private static boolean loadLazy;
public static boolean loadLazy;
private static void expect(boolean v) {
public static void expect(boolean v) {
if (! v) throw new RuntimeException();
}
@ -104,8 +104,7 @@ public class LazyLoading {
expect(lazy instanceof Lazy);
// invokeinterface
Interface i = array[0];
expect(i.interfaceMethod() == 42);
expect(array[0].interfaceMethod() == 42);
// invokestatic
expect(Lazy.staticMethod() == 43);

4
test/test.sh
View File

@ -12,7 +12,9 @@ tests=${@}
log=log.txt
export ${ld_path}
if [[ ! -z ${ld_path} ]]; then
export ${ld_path}
fi
echo -n "" >${log}