From b35f236066f5d779fe75df8595865fd129f2ae2c Mon Sep 17 00:00:00 2001 From: Joel Dice Date: Fri, 13 Mar 2015 15:21:29 -0600 Subject: [PATCH 1/2] delete cmake-build and distrib in clean target --- makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/makefile b/makefile index 908f9dc151..d244b86bb0 100755 --- a/makefile +++ b/makefile @@ -1623,8 +1623,9 @@ jdk-test: $(test-dep) $(build)/classpath.jar $(build)/jdk-run-tests.sh $(build)/ tarball: @echo "creating build/avian-$(version).tar.bz2" @mkdir -p build - (cd .. && tar --exclude=build --exclude='.*' --exclude='*~' -cjf \ - avian/build/avian-$(version).tar.bz2 avian) + (cd .. && tar --exclude=build --exclude=cmake-build --exclude=distrib \ + --exclude='.*' --exclude='*~' \ + -cjf avian/build/avian-$(version).tar.bz2 avian) .PHONY: clean-current clean-current: @@ -1634,7 +1635,7 @@ clean-current: .PHONY: clean clean: @echo "removing build" - rm -rf build + rm -rf build cmake-build distrib ifeq ($(continuations),true) $(build)/compile-x86-asm.o: $(src)/continuations-x86.$(asm-format) From d6c9d3c2d0d975bfbaa148d98805766413e1416e Mon Sep 17 00:00:00 2001 From: Joel Dice Date: Fri, 13 Mar 2015 15:28:14 -0600 Subject: [PATCH 2/2] disable openjdk=... and jdk tests if arch flag specified These combinations generally won't work, since the JAVA_HOME JDK will tend to match the native, default architecture, not the one specified. --- test/ci.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/ci.sh b/test/ci.sh index 76f3f4f766..4c99e1d945 100755 --- a/test/ci.sh +++ b/test/ci.sh @@ -86,7 +86,7 @@ else make_target=test - run make jdk-test + (! has_flag arch) && run make ${flags} jdk-test run make ${flags} ${make_target} run make ${flags} mode=debug ${make_target} run make ${flags} process=interpret ${make_target} @@ -95,7 +95,7 @@ else run make ${flags} mode=debug bootimage=true ${make_target} && \ run make ${flags} bootimage=true ${make_target} - (! has_flag openjdk && ! has_flag android) && \ + (! has_flag openjdk && ! has_flag android && ! has_flag arch) && \ run make ${flags} openjdk=$JAVA_HOME ${make_target} run make ${flags} tails=true continuations=true heapdump=true ${make_target}