kfreebsd-i386 boot test support

diff --git a/conf/common.rmk b/conf/common.rmk
index 905024a55e8c34910c9ee3c479fca20c99a21c29..14fe542000a5a6baa6a592d81573cd6eb4649518 100644 (file)
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@ -697,6 +697,7 @@ grub_mkpasswd_pbkdf2_CFLAGS += -Wno-missing-field-initializers -Wno-error -I$(sr
 
 # Randomly generated
 SUCCESSFUL_BOOT_STRING=3e49994fd5d82b7c9298d672d774080d
+BOOTCHECK_TIMEOUT=60
 
 bootcheck: $(BOOTCHECKS)
 

diff --git a/conf/i386-pc.rmk b/conf/i386-pc.rmk
index 33575a87c74400fb14eb2df7a206a78e574b4c8d..f01cba620f540ffe1a3f792ac27e77f8c929afed 100644 (file)
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@ -371,10 +371,10 @@ endif
 BOOTTARGET=bios-cd
 
 bootcheck-linux16-i386: linux-initramfs.i386 $(GRUB_PAYLOADS_DIR)/linux.i386 $(srcdir)/tests/boot/linux.cfg grub-shell
-       timeout -s KILL 30s ./grub-shell --boot=$(BOOTTARGET) --qemu=qemu-system-i386 --files=/initrd=linux-initramfs.i386 --files=/linux=$(GRUB_PAYLOADS_DIR)/linux.i386 $(srcdir)/tests/boot/linux16.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
+       timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --boot=$(BOOTTARGET) --qemu=qemu-system-i386 --files=/initrd=linux-initramfs.i386 --files=/linux=$(GRUB_PAYLOADS_DIR)/linux.i386 $(srcdir)/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)/tests/boot/linux.cfg grub-shell
-       timeout -s KILL 30s ./grub-shell --boot=$(BOOTTARGET) --qemu=qemu-system-x86_64 --files=/initrd=linux-initramfs.x86_64 --files=/linux=$(GRUB_PAYLOADS_DIR)/linux.x86_64 $(srcdir)/tests/boot/linux16.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
+       timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --boot=$(BOOTTARGET) --qemu=qemu-system-x86_64 --files=/initrd=linux-initramfs.x86_64 --files=/linux=$(GRUB_PAYLOADS_DIR)/linux.x86_64 $(srcdir)/tests/boot/linux16.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
 
 BOOTCHECKS+=bootcheck-linux16-i386 bootcheck-linux16-x86_64
 

diff --git a/conf/i386.rmk b/conf/i386.rmk
index 9305bf09c4383cb782bfd78678d6dd22f8ce17ce..3743191bea23618088a65502b230e2f691517114 100644 (file)
--- a/conf/i386.rmk
+++ b/conf/i386.rmk
@@ -45,20 +45,30 @@ multiboot2_mod_ASFLAGS = $(COMMON_ASFLAGS)
 linuxinit.x86_64: $(srcdir)/tests/boot/linuxinit-x86_64.S
        $(TARGET_CC) -o $@ $< -m64 -nostdlib -nostdinc -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\"
 
-linuxinit.i386: $(srcdir)/tests/boot/linuxinit-i386.S
+linux.init.i386: $(srcdir)/tests/boot/linux.init-i386.S
        $(TARGET_CC) -o $@ $< -m32 -nostdlib -nostdinc -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\"
 
-linux-initramfs.%: linuxinit.% Makefile
-       TDIR=`mktemp -d`; (cp $< $$TDIR/init; cd $$TDIR; echo ./init | cpio --quiet --dereference -o -H newc) | gzip > $@; rm -rf $$TDIR
+kfreebsd.init.i386: $(srcdir)/tests/boot/kfreebsd.init-i386.S
+       $(TARGET_CC) -o $@ $< -m32 -nostdlib -nostdinc -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\" && freebsd-brandelf -t FreeBSD $@
+
+linux-initramfs.%: linux.init.% Makefile
+       TDIR=`mktemp -d`; cp $< $$TDIR/init; (cd $$TDIR; echo ./init | cpio --quiet --dereference -o -H newc) | gzip > $@; rm -rf $$TDIR
+
+kfreebsd-mfsroot.%: kfreebsd.init.% 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
+
+CLEANFILES += linux.init.i386 kfreebsd.init.i386 linux.init.x86_64 linux-initramfs.i386 linux-initramfs.x86_64
+
+bootcheck-kfreebsd-i386: kfreebsd-mfsroot.i386 $(GRUB_PAYLOADS_DIR)/kfreebsd.i386 $(GRUB_PAYLOADS_DIR)/kfreebsd_env.i386 $(srcdir)/tests/boot/kfreebsd.cfg grub-shell
+       timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --boot=$(BOOTTARGET) --qemu=qemu-system-i386 --files=/mfsroot=kfreebsd-mfsroot.i386 --files=/kfreebsd=$(GRUB_PAYLOADS_DIR)/kfreebsd.i386 --files=/kfreebsd_env=$(GRUB_PAYLOADS_DIR)/kfreebsd_env.i386 $(srcdir)/tests/boot/kfreebsd.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
 
-CLEANFILES += linuxinit.i386 linuxinit.x86_64 linux-initramfs.i386 linux-initramfs.x86_64
 
 bootcheck-linux-i386: linux-initramfs.i386 $(GRUB_PAYLOADS_DIR)/linux.i386 $(srcdir)/tests/boot/linux.cfg grub-shell
-       timeout -s KILL 30s ./grub-shell --boot=$(BOOTTARGET) --qemu=qemu-system-i386 --files=/initrd=linux-initramfs.i386 --files=/linux=$(GRUB_PAYLOADS_DIR)/linux.i386 $(srcdir)/tests/boot/linux.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
+       timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --boot=$(BOOTTARGET) --qemu=qemu-system-i386 --files=/initrd=linux-initramfs.i386 --files=/linux=$(GRUB_PAYLOADS_DIR)/linux.i386 $(srcdir)/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)/tests/boot/linux.cfg grub-shell
-       timeout -s KILL 30s ./grub-shell --boot=$(BOOTTARGET) --qemu=qemu-system-x86_64 --files=/initrd=linux-initramfs.x86_64 --files=/linux=$(GRUB_PAYLOADS_DIR)/linux.x86_64 $(srcdir)/tests/boot/linux.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
+       timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --boot=$(BOOTTARGET) --qemu=qemu-system-x86_64 --files=/initrd=linux-initramfs.x86_64 --files=/linux=$(GRUB_PAYLOADS_DIR)/linux.x86_64 $(srcdir)/tests/boot/linux.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
 
-BOOTCHECKS+=bootcheck-linux-i386 bootcheck-linux-x86_64
+BOOTCHECKS+=bootcheck-linux-i386 bootcheck-linux-x86_64 bootcheck-kfreebsd-i386
 
-.PHONY: bootcheck-linux-i386 bootcheck-linux-x86_64
+.PHONY: bootcheck-linux-i386 bootcheck-linux-x86_64 bootcheck-kfreebsd-i386

diff --git a/tests/boot/kfreebsd.cfg b/tests/boot/kfreebsd.cfg
new file mode 100644 (file)
index 0000000..71b97b6
--- /dev/null
+++ b/tests/boot/kfreebsd.cfg
@@ -0,0 +1,6 @@
+kfreebsd /kfreebsd -h
+kfreebsd_loadenv /kfreebsd_env
+kfreebsd_module /mfsroot type=mfs_root
+boot
+# Shouln't happen
+halt

diff --git a/tests/boot/kfreebsd.init-i386.S b/tests/boot/kfreebsd.init-i386.S
new file mode 100644 (file)
index 0000000..8812b65
--- /dev/null
+++ b/tests/boot/kfreebsd.init-i386.S
@@ -0,0 +1,74 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2010  Free Software Foundation, Inc.
+ *
+ *  GRUB is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  GRUB is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#define MODE_RDRW 2
+#define FLAGS_NONE 0
+#define SYSCALL_OPEN 5
+#define SYSCALL_WRITE 4
+#define SYSCALL_RESET 55
+#define SYSCALL_EXIT 1
+#define SYSCALL_INT 0x80
+
+#define RESET_NOSYNC 0x4
+#define RESET_HALT 0x8
+#define RESET_POWEROFF 0x4000
+
+       .section ".init", "ax"
+       .global start,_start
+start:
+_start:
+       /* open.  */
+       movl $SYSCALL_OPEN, %eax
+       pushl $FLAGS_NONE
+       pushl $MODE_RDRW
+       leal device, %ebx
+       pushl %ebx
+       pushl $0
+       int $SYSCALL_INT
+       addl $16, %esp
+       movl %eax, %ecx
+
+       /* write.  */
+       movl $SYSCALL_WRITE, %eax
+       pushl $(messageend-message)
+       leal message, %ebx
+       pushl %ebx
+       pushl %ecx
+       pushl $0
+       int $SYSCALL_INT
+       addl $16, %esp
+       
+       /* shutdown.  */
+       movl $SYSCALL_RESET, %eax
+       pushl $(RESET_POWEROFF|RESET_HALT|RESET_NOSYNC)
+       pushl $0
+       int $SYSCALL_INT
+       addl $8, %esp
+
+       /* exit (1). Shouldn't be reached.  */
+       movl $SYSCALL_EXIT, %eax
+       pushl $1
+       pushl $0
+       int $SYSCALL_INT
+device:
+       .ascii "/dev/console"
+       .byte 0
+message:
+       .ascii "Boot Test Passed Successfully\n" SUCCESSFUL_BOOT_STRING "\n"
+messageend:
+       
\ No newline at end of file

diff --git a/tests/boot/linux.cfg b/tests/boot/linux.cfg
index 201de99fdea72ec94fdbd7e52d92cb2069747790..f5bf6ac7d858410bbdb85013be29e46a97518f78 100644 (file)
--- a/tests/boot/linux.cfg
+++ b/tests/boot/linux.cfg
@@ -1,3 +1,5 @@
 linux /linux console=ttyS0 root=/dev/ram0
 initrd /initrd
 boot
+# Shouln't happen
+halt

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

diff --git a/tests/boot/linux16.cfg b/tests/boot/linux16.cfg
index ed0a50872504becdbe24eb0ebf5a1150f58d40bf..d7fbf961cd9ac40d9a31009e0d4acd8ec5cceb18 100644 (file)
--- a/tests/boot/linux16.cfg
+++ b/tests/boot/linux16.cfg
@@ -1,3 +1,5 @@
 linux16 /linux console=ttyS0 root=/dev/ram0
 initrd16 /initrd
 boot
+# Shouln't happen
+halt