Merge pull request #459 from dicej/bootimage-test

add bootimage-test option to makefile

classpath/avian/SystemClassLoader.java

@@ -83,6 +83,8 @@ public class SystemClassLoader extends ClassLoader {
       if (source != null) {
         // todo: load attributes from JAR manifest
         definePackage(name, null, null, null, null, null, null, null);
+      } else {
+        definePackage(name, null, null, null, null, null, null, null);
       }
     }
 

makefile

@@ -45,6 +45,11 @@ ifneq ($(lzma),)
 endif
 ifeq ($(bootimage),true)
 	options := $(options)-bootimage
+	ifeq ($(bootimage-test),true)
+    # this option indicates that we should AOT-compile the test
+    # classes as well as the class library
+		options := $(options)-test
+	endif
 endif
 ifeq ($(tails),true)
 	options := $(options)-tails
@@ -92,6 +97,12 @@ ifeq ($(platform),ios)
 	endif
 endif
 
+ifeq ($(bootimage-test),true)
+	ifneq ($(bootimage),true)
+		x := $(error "bootimage-test=true only works when bootimage=true")
+	endif
+endif
+
 aot-only = false
 root := $(shell (cd .. && pwd))
 build = build/$(platform)-$(arch)$(options)
@@ -109,6 +120,12 @@ wp8 ?= $(root)/wp8
 
 classpath = avian
 
+bootimage-classpath = $(classpath-build)
+
+ifeq ($(bootimage-test),true)
+	bootimage-classpath = $(classpath-build):$(test-build)
+endif
+
 test-executable = $(shell pwd)/$(executable)
 boot-classpath = $(classpath-build)
 embed-prefix = /avian-embedded
@@ -1647,7 +1664,6 @@ debug: build
 vg: build
 	$(library-path) $(vg) $(test-executable) $(test-args)
 
-
 .PHONY: test
 test: build-test run-test
 
@@ -2066,9 +2082,9 @@ else
 endif
 
 $(bootimage-object) $(codeimage-object): $(bootimage-generator) \
-		$(classpath-jar-dep)
+		$(classpath-jar-dep) $(test-dep)
 	@echo "generating bootimage and codeimage binaries from $(classpath-build) using $(<)"
-	$(<) -cp $(classpath-build) -bootimage $(bootimage-object) -codeimage $(codeimage-object) \
+	$(<) -cp $(bootimage-classpath) -bootimage $(bootimage-object) -codeimage $(codeimage-object) \
 		-bootimage-symbols $(bootimage-symbols) \
 		-codeimage-symbols $(codeimage-symbols) \
 		-hostvm $(host-vm)
@@ -2126,7 +2142,7 @@ $(unittest-executable): $(unittest-executable-objects)
 
 $(bootimage-generator): $(bootimage-generator-objects) $(vm-objects)
 	echo building $(bootimage-generator) arch=$(build-arch) platform=$(bootimage-platform)
-	$(MAKE) process=interpret bootimage= mode=$(mode)
+	$(MAKE) process=interpret bootimage= bootimage-test= mode=$(mode)
 	$(MAKE) mode=$(mode) \
 		build=$(host-build-root) \
 		arch=$(build-arch) \

test/Misc.java

@@ -291,9 +291,18 @@ public class Misc {
           test = true;
         }
       }
-      expect(count == 2);
+      // This test is only relevant if multi-classpath-test.txt
-      expect(test);
+      // actually exists in somewhere under the classpath from which
-      expect(extraDir);
+      // Misc.class was loaded.  Since we run this test from an
+      // AOT-compiled boot image as well as straight from the
+      // filesystem, and the boot image does not contain
+      // multi-classpath-test.txt, we'll skip the test if it's not
+      // present.
+      if (count != 0) {
+        expect(count == 2);
+        expect(test);
+        expect(extraDir);
+      }
     } catch (IOException e) {
       throw new RuntimeException(e);
     }

test/ci.sh

@@ -97,6 +97,7 @@ else
   if has_flag openjdk-src || ! has_flag openjdk; then
     run make ${flags} mode=debug bootimage=true ${make_target}
     run make ${flags} bootimage=true ${make_target}
+    run make ${flags} bootimage=true bootimage-test=true ${make_target}
   fi
 
   if ! has_flag openjdk && ! has_flag android && ! has_flag arch; then