Enable boottests

diff --git a/Makefile.am b/Makefile.am
index f49a92eadb83184615d9241209dc4d8b98e65a8d..9988c40992273e50b1c42a8c5645933cc011f19b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -82,4 +82,146 @@ CLEANFILES += widthspec.h
 platform_HEADERS = config.h
 
 pkglib_DATA += grub-mkconfig_lib
-pkglib_DATA += update-grub_lib
\ No newline at end of file
+pkglib_DATA += update-grub_lib
+
+
+if COND_i386_coreboot
+BOOTTARGET=coreboot
+QEMU32=qemu-system-i386
+endif
+
+if COND_i386_multiboot
+BOOTTARGET=cd
+QEMU32=qemu-system-i386
+endif
+
+if COND_i386_ieee1275
+BOOTTARGET=cd
+QEMU32=qemu-system-i386
+endif
+
+if COND_i386_qemu
+BOOTTARGET=qemu
+QEMU32=qemu-system-i386
+endif
+
+if COND_i386_pc
+BOOTTARGET=cd
+QEMU32=qemu-system-i386
+endif
+
+if COND_i386_efi
+QEMU32=qemu-system-i386
+BOOTTARGET=cd
+endif
+
+if COND_x86_64_efi
+QEMU32=qemu-system-x86_64
+BOOTTARGET=cd
+endif
+
+linux.init.x86_64: $(srcdir)/grub-core/tests/boot/linux.init-x86_64.S
+       $(TARGET_CC) -o $@ $< -m64 -nostdlib -nostdinc -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\"
+
+linux.init.i386: $(srcdir)/grub-core/tests/boot/linux.init-i386.S
+       $(TARGET_CC) -o $@ $< -m32 -nostdlib -nostdinc -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\"
+
+kfreebsd.init.x86_64: $(srcdir)/grub-core/tests/boot/kfreebsd.init-x86_64.S
+       $(TARGET_CC) -o $@ $< -m64 -nostdlib -nostdinc -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\" && freebsd-brandelf -t FreeBSD $@
+
+kfreebsd.init.i386: $(srcdir)/grub-core/tests/boot/kfreebsd.init-i386.S
+       $(TARGET_CC) -o $@ $< -m32 -nostdlib -nostdinc -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\" && freebsd-brandelf -t FreeBSD $@
+
+knetbsd.init.i386: $(srcdir)/grub-core/tests/boot/knetbsd.init-i386.S
+       $(TARGET_CC) -o $@ $< -m32 -nostdlib -nostdinc -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\"
+
+knetbsd.init.x86_64: $(srcdir)/grub-core/tests/boot/knetbsd.init-x86_64.S
+       $(TARGET_CC) -o $@ $< -m64 -nostdlib -nostdinc -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\"
+
+linux-initramfs.i386: linux.init.i386 Makefile
+       TDIR=`mktemp -d`; cp $< $$TDIR/init; (cd $$TDIR; echo ./init | cpio --quiet --dereference -o -H newc) | gzip > $@; rm -rf $$TDIR
+
+linux-initramfs.x86_64: linux.init.x86_64 Makefile
+       TDIR=`mktemp -d`; cp $< $$TDIR/init; (cd $$TDIR; echo ./init | cpio --quiet --dereference -o -H newc) | gzip > $@; rm -rf $$TDIR
+
+kfreebsd-mfsroot.i386.img: kfreebsd.init.i386 Makefile
+       TDIR=`mktemp -d`; mkdir $$TDIR/dev; mkdir $$TDIR/sbin; cp $< $$TDIR/sbin/init; makefs -t ffs -s 30m -f 1000 -o minfree=0,version=1 $@ $$TDIR; rm -rf $$TDIR
+
+knetbsd.image.i386: knetbsd.init.i386
+       TDIR=`mktemp -d` && mkdir $$TDIR/dev && mkdir $$TDIR/sbin && cp $< $$TDIR/sbin/init && makefs -t ffs -s 64k -f 10 -o minfree=0,version=1 $@ $$TDIR && rm -rf $$TDIR
+
+knetbsd.miniroot-image.i386.img: knetbsd.image.i386 $(GRUB_PAYLOADS_DIR)/knetbsd.miniroot.i386
+       $(OBJCOPY) --add-section=miniroot=$< $(GRUB_PAYLOADS_DIR)/knetbsd.miniroot.i386 $@
+
+kfreebsd-mfsroot.x86_64.img: kfreebsd.init.x86_64 Makefile
+       TDIR=`mktemp -d`; mkdir $$TDIR/dev; mkdir $$TDIR/sbin; cp $< $$TDIR/sbin/init; makefs -t ffs -s 30m -f 1000 -o minfree=0,version=1 $@ $$TDIR; rm -rf $$TDIR
+
+knetbsd.image.x86_64: knetbsd.init.x86_64
+       TDIR=`mktemp -d` && mkdir $$TDIR/dev && mkdir $$TDIR/sbin && cp $< $$TDIR/sbin/init && makefs -t ffs -s 64k -f 10 -o minfree=0,version=1 $@ $$TDIR && rm -rf $$TDIR
+
+knetbsd.miniroot-image.x86_64.img: knetbsd.image.x86_64 $(GRUB_PAYLOADS_DIR)/knetbsd.miniroot.x86_64
+       $(OBJCOPY) --add-section=miniroot=$< $(GRUB_PAYLOADS_DIR)/knetbsd.miniroot.x86_64 $@
+
+CLEANFILES += linux.init.i386 kfreebsd.init.i386 linux.init.x86_64 linux-initramfs.i386 linux-initramfs.x86_64
+
+kfreebsd-mfsroot.i386.gz: kfreebsd-mfsroot.i386.img
+       gzip < $< > $@
+
+bootcheck-kfreebsd-i386: kfreebsd-mfsroot.i386.gz $(GRUB_PAYLOADS_DIR)/kfreebsd.i386 $(GRUB_PAYLOADS_DIR)/kfreebsd_env.i386 $(srcdir)/grub-core/tests/boot/kfreebsd.cfg grub-shell
+       timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --qemu-opts="$(GRUB_QEMU_OPTS)" --boot=$(BOOTTARGET) --qemu=$(QEMU32) --files=/mfsroot.gz=kfreebsd-mfsroot.i386.gz --files=/kfreebsd=$(GRUB_PAYLOADS_DIR)/kfreebsd.i386 --files=/kfreebsd_env=$(GRUB_PAYLOADS_DIR)/kfreebsd_env.i386 $(srcdir)/grub-core/tests/boot/kfreebsd.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
+
+kfreebsd-mfsroot.x86_64.gz: kfreebsd-mfsroot.x86_64.img
+       gzip < $< > $@
+
+bootcheck-kfreebsd-x86_64: kfreebsd-mfsroot.x86_64.gz $(GRUB_PAYLOADS_DIR)/kfreebsd.x86_64 $(GRUB_PAYLOADS_DIR)/kfreebsd_env.x86_64 $(srcdir)/grub-core/tests/boot/kfreebsd.cfg grub-shell
+       timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --qemu-opts="$(GRUB_QEMU_OPTS)" --boot=$(BOOTTARGET) --qemu=qemu-system-x86_64 --files=/mfsroot.gz=kfreebsd-mfsroot.x86_64.gz --files=/kfreebsd=$(GRUB_PAYLOADS_DIR)/kfreebsd.x86_64 --files=/kfreebsd_env=$(GRUB_PAYLOADS_DIR)/kfreebsd_env.x86_64 $(srcdir)/grub-core/tests/boot/kfreebsd.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
+
+knetbsd.miniroot-image.i386.gz: knetbsd.miniroot-image.i386.img
+       gzip < $< > $@
+
+bootcheck-knetbsd-i386: knetbsd.miniroot-image.i386.gz $(GRUB_PAYLOADS_DIR)/knetbsd.i386 $(srcdir)/grub-core/tests/boot/knetbsd.cfg grub-shell
+       timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --qemu-opts="$(GRUB_QEMU_OPTS)" --boot=$(BOOTTARGET) --qemu=qemu-system-i386 --files=/miniroot.gz=knetbsd.miniroot-image.i386.gz --files=/knetbsd=$(GRUB_PAYLOADS_DIR)/knetbsd.i386 $(srcdir)/grub-core/tests/boot/knetbsd.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
+
+knetbsd.miniroot-image.x86_64.gz: knetbsd.miniroot-image.x86_64.img
+       gzip < $< > $@
+
+bootcheck-knetbsd-x86_64: knetbsd.miniroot-image.x86_64.gz $(GRUB_PAYLOADS_DIR)/knetbsd.x86_64 $(srcdir)/grub-core/tests/boot/knetbsd.cfg grub-shell
+       timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --qemu-opts="$(GRUB_QEMU_OPTS)" --boot=$(BOOTTARGET) --qemu=qemu-system-x86_64 --files=/miniroot.gz=knetbsd.miniroot-image.x86_64.gz --files=/knetbsd=$(GRUB_PAYLOADS_DIR)/knetbsd.x86_64 $(srcdir)/grub-core/tests/boot/knetbsd.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
+
+bootcheck-linux-i386: linux-initramfs.i386 $(GRUB_PAYLOADS_DIR)/linux.i386 $(srcdir)/grub-core/tests/boot/linux.cfg grub-shell
+       timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --qemu-opts="$(GRUB_QEMU_OPTS)" --boot=$(BOOTTARGET) --qemu=$(QEMU32) --files=/initrd=linux-initramfs.i386 --files=/linux=$(GRUB_PAYLOADS_DIR)/linux.i386 $(srcdir)/grub-core/tests/boot/linux.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
+
+bootcheck-linux-x86_64: linux-initramfs.x86_64 $(GRUB_PAYLOADS_DIR)/linux.x86_64 $(srcdir)/grub-core/tests/boot/linux.cfg grub-shell
+       timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --qemu-opts="$(GRUB_QEMU_OPTS)" --boot=$(BOOTTARGET) --qemu=qemu-system-x86_64 --files=/initrd=linux-initramfs.x86_64 --files=/linux=$(GRUB_PAYLOADS_DIR)/linux.x86_64 $(srcdir)/grub-core/tests/boot/linux.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
+
+bootcheck-linux16-i386: linux-initramfs.i386 $(GRUB_PAYLOADS_DIR)/linux.i386 $(srcdir)/grub-core/tests/boot/linux.cfg grub-shell
+       timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --qemu-opts="$(GRUB_QEMU_OPTS)" --boot=$(BOOTTARGET) --qemu=$(QEMU32) --files=/initrd=linux-initramfs.i386 --files=/linux=$(GRUB_PAYLOADS_DIR)/linux.i386 $(srcdir)/grub-core/tests/boot/linux16.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
+
+bootcheck-linux16-x86_64: linux-initramfs.x86_64 $(GRUB_PAYLOADS_DIR)/linux.x86_64 $(srcdir)/grub-core/tests/boot/linux.cfg grub-shell
+       timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --qemu-opts="$(GRUB_QEMU_OPTS)" --boot=$(BOOTTARGET) --qemu=qemu-system-x86_64 --files=/initrd=linux-initramfs.x86_64 --files=/linux=$(GRUB_PAYLOADS_DIR)/linux.x86_64 $(srcdir)/grub-core/tests/boot/linux16.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
+
+BOOTCHECKS= 
+
+BOOTCHECKS += bootcheck-linux16-i386 bootcheck-linux16-x86_64
+
+BOOTCHECKS += bootcheck-linux-i386 bootcheck-linux-x86_64 
+
+# Crashes because memory at 0-0x1000 is occupied
+BOOTCHECKS += bootcheck-kfreebsd-i386 bootcheck-knetbsd-x86_64
+
+# Requires ACPI
+BOOTCHECKS += bootcheck-kfreebsd-x86_64
+# Crashes early on non-BIOS
+BOOTCHECKS += bootcheck-knetbsd-i386
+
+
+.PHONY: bootcheck-linux-i386 bootcheck-linux-x86_64 \
+       bootcheck-kfreebsd-i386 bootcheck-kfreebsd-x86_64 \
+       bootcheck-knetbsd-i386 bootcheck-knetbsd-x86_64
+
+# Randomly generated
+SUCCESSFUL_BOOT_STRING=3e49994fd5d82b7c9298d672d774080d
+# tianocore cd access is very slow
+BOOTCHECK_TIMEOUT=180
+
+bootcheck: $(BOOTCHECKS)

diff --git a/tests/boot/kfreebsd.cfg b/grub-core/tests/boot/kfreebsd.cfg
similarity index 100%
rename from tests/boot/kfreebsd.cfg
rename to grub-core/tests/boot/kfreebsd.cfg

diff --git a/tests/boot/kfreebsd.init-i386.S b/grub-core/tests/boot/kfreebsd.init-i386.S
similarity index 100%
rename from tests/boot/kfreebsd.init-i386.S
rename to grub-core/tests/boot/kfreebsd.init-i386.S

diff --git a/tests/boot/kfreebsd.init-x86_64.S b/grub-core/tests/boot/kfreebsd.init-x86_64.S
similarity index 100%
rename from tests/boot/kfreebsd.init-x86_64.S
rename to grub-core/tests/boot/kfreebsd.init-x86_64.S

diff --git a/tests/boot/knetbsd.cfg b/grub-core/tests/boot/knetbsd.cfg
similarity index 100%
rename from tests/boot/knetbsd.cfg
rename to grub-core/tests/boot/knetbsd.cfg

diff --git a/tests/boot/knetbsd.init-i386.S b/grub-core/tests/boot/knetbsd.init-i386.S
similarity index 100%
rename from tests/boot/knetbsd.init-i386.S
rename to grub-core/tests/boot/knetbsd.init-i386.S

diff --git a/tests/boot/knetbsd.init-x86_64.S b/grub-core/tests/boot/knetbsd.init-x86_64.S
similarity index 100%
rename from tests/boot/knetbsd.init-x86_64.S
rename to grub-core/tests/boot/knetbsd.init-x86_64.S

diff --git a/tests/boot/linux.cfg b/grub-core/tests/boot/linux.cfg
similarity index 100%
rename from tests/boot/linux.cfg
rename to grub-core/tests/boot/linux.cfg

diff --git a/tests/boot/linux.init-i386.S b/grub-core/tests/boot/linux.init-i386.S
similarity index 100%
rename from tests/boot/linux.init-i386.S
rename to grub-core/tests/boot/linux.init-i386.S

diff --git a/tests/boot/linux.init-x86_64.S b/grub-core/tests/boot/linux.init-x86_64.S
similarity index 100%
rename from tests/boot/linux.init-x86_64.S
rename to grub-core/tests/boot/linux.init-x86_64.S

diff --git a/tests/boot/linux16.cfg b/grub-core/tests/boot/linux16.cfg
similarity index 100%
rename from tests/boot/linux16.cfg
rename to grub-core/tests/boot/linux16.cfg

diff --git a/tests/util/grub-shell.in b/tests/util/grub-shell.in
index 09847db2bc05a97e470d9c558f9abd029c5b09e1..e21cc95f4ce5b5b237695de35a8e6cdca07c0eb0 100644 (file)
--- a/tests/util/grub-shell.in
+++ b/tests/util/grub-shell.in
@@ -164,7 +164,7 @@ if [ x$boot = xcoreboot ]; then
     device=cdrom
 fi
 
-${qemu} ${qemuopts} -nographic -serial file:/dev/stdout -monitor file:/dev/null -${device} ${isofile} ${bootdev} | tr -d "\r"
+${qemu} ${qemuopts} -nographic -serial file:/dev/stdout -monitor file:/dev/null -${device} ${isofile} ${bootdev} | cat | tr -d "\r"
 rm -f "${isofile}" "${imgfile}"
 rm -rf "${rom_directory}"
 if [ x$boot = xcoreboot ]; then