merge bootcheck into newreloc
This commit is contained in:
commit
6b9e2c181f
18 changed files with 466 additions and 23 deletions
|
@ -1,3 +1,12 @@
|
|||
2010-01-17 Robert Millan <rmh.grub@aybabtu.com>
|
||||
|
||||
* include/grub/test.h: Add license header.
|
||||
* tests/example_functional_test.c: Likewise.
|
||||
* tests/example_unit_test.c: Likewise.
|
||||
* tests/lib/functional_test.c: Likewise.
|
||||
* tests/lib/test.c: Likewise.
|
||||
* tests/lib/unit_test.c: Likewise.
|
||||
|
||||
2010-01-17 Vladimir Serbinenko <phcoder@gmail.com>
|
||||
|
||||
Use flag-based instead of hook-based video mode selection and "auto"
|
||||
|
|
|
@ -695,4 +695,10 @@ bin_UTILITIES += grub-mkpasswd-pbkdf2
|
|||
grub_mkpasswd_pbkdf2_SOURCES = gnulib/progname.c util/grub-mkpasswd-pbkdf2.c lib/crypto.c lib/libgcrypt-grub/cipher/sha512.c lib/pbkdf2.c util/misc.c kern/err.c
|
||||
grub_mkpasswd_pbkdf2_CFLAGS += -Wno-missing-field-initializers -Wno-error -I$(srcdir)/lib/libgcrypt_wrap -DGRUB_MKPASSWD=1
|
||||
|
||||
# Randomly generated
|
||||
SUCCESSFUL_BOOT_STRING=3e49994fd5d82b7c9298d672d774080d
|
||||
BOOTCHECK_TIMEOUT=60
|
||||
|
||||
bootcheck: $(BOOTCHECKS)
|
||||
|
||||
include $(srcdir)/conf/gcry.mk
|
||||
|
|
|
@ -347,5 +347,15 @@ pkglib_DATA += efiemu32.o efiemu64.o
|
|||
|
||||
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 $(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 $(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
|
||||
|
||||
include $(srcdir)/conf/i386.mk
|
||||
include $(srcdir)/conf/common.mk
|
||||
|
|
|
@ -68,3 +68,41 @@ pkglib_MODULES += serial.mod
|
|||
serial_mod_SOURCES = term/i386/pc/serial.c
|
||||
serial_mod_CFLAGS = $(COMMON_CFLAGS)
|
||||
serial_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
||||
|
||||
linux.init.x86_64: $(srcdir)/tests/boot/linux.init-x86_64.S
|
||||
$(TARGET_CC) -o $@ $< -m64 -nostdlib -nostdinc -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\"
|
||||
|
||||
linux.init.i386: $(srcdir)/tests/boot/linux.init-i386.S
|
||||
$(TARGET_CC) -o $@ $< -m32 -nostdlib -nostdinc -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\"
|
||||
|
||||
kfreebsd.init.x86_64: $(srcdir)/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)/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
|
||||
|
||||
bootcheck-kfreebsd-x86_64: kfreebsd-mfsroot.x86_64 $(GRUB_PAYLOADS_DIR)/kfreebsd.x86_64 $(GRUB_PAYLOADS_DIR)/kfreebsd_env.x86_64 $(srcdir)/tests/boot/kfreebsd.cfg grub-shell
|
||||
timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --boot=$(BOOTTARGET) --qemu=qemu-system-x86_64 --files=/mfsroot=kfreebsd-mfsroot.x86_64 --files=/kfreebsd=$(GRUB_PAYLOADS_DIR)/kfreebsd.x86_64 --files=/kfreebsd_env=$(GRUB_PAYLOADS_DIR)/kfreebsd_env.x86_64 $(srcdir)/tests/boot/kfreebsd.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
|
||||
|
||||
bootcheck-linux-i386: linux-initramfs.i386 $(GRUB_PAYLOADS_DIR)/linux.i386 $(srcdir)/tests/boot/linux.cfg grub-shell
|
||||
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 $(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 \
|
||||
bootcheck-kfreebsd-i386 bootcheck-kfreebsd-x86_64
|
||||
|
||||
.PHONY: bootcheck-linux-i386 bootcheck-linux-x86_64 \
|
||||
bootcheck-kfreebsd-i386 bootcheck-kfreebsd-x86_64
|
||||
|
|
|
@ -1,3 +1,21 @@
|
|||
/*
|
||||
* 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/>.
|
||||
*/
|
||||
|
||||
#ifndef GRUB_TEST_HEADER
|
||||
#define GRUB_TEST_HEADER
|
||||
|
||||
|
|
6
tests/boot/kfreebsd.cfg
Normal file
6
tests/boot/kfreebsd.cfg
Normal file
|
@ -0,0 +1,6 @@
|
|||
kfreebsd /kfreebsd -h
|
||||
kfreebsd_loadenv /kfreebsd_env
|
||||
kfreebsd_module /mfsroot type=mfs_root
|
||||
boot
|
||||
# Shouln't happen
|
||||
halt
|
74
tests/boot/kfreebsd.init-i386.S
Normal file
74
tests/boot/kfreebsd.init-i386.S
Normal file
|
@ -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:
|
||||
|
62
tests/boot/kfreebsd.init-x86_64.S
Normal file
62
tests/boot/kfreebsd.init-x86_64.S
Normal file
|
@ -0,0 +1,62 @@
|
|||
/*
|
||||
* 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 RESET_NOSYNC 0x4
|
||||
#define RESET_HALT 0x8
|
||||
#define RESET_POWEROFF 0x4000
|
||||
|
||||
.section ".init", "ax"
|
||||
.global start,_start
|
||||
start:
|
||||
_start:
|
||||
/* open. */
|
||||
movq $SYSCALL_OPEN, %rax
|
||||
leaq device, %rdi
|
||||
movq $MODE_RDRW, %rsi
|
||||
movq $FLAGS_NONE, %rdx
|
||||
syscall
|
||||
movq %rax, %rdi
|
||||
|
||||
/* write. */
|
||||
movq $SYSCALL_WRITE, %rax
|
||||
leaq message, %rsi
|
||||
movq $(messageend-message), %rdx
|
||||
syscall
|
||||
|
||||
/* shutdown. */
|
||||
movq $SYSCALL_RESET, %rax
|
||||
movq $(RESET_POWEROFF|RESET_HALT|RESET_NOSYNC), %rdi
|
||||
syscall
|
||||
|
||||
/* exit (1). Shouldn't be reached. */
|
||||
movq $SYSCALL_EXIT, %rax
|
||||
movq $1, %rdi
|
||||
syscall
|
||||
device:
|
||||
.ascii "/dev/console"
|
||||
.byte 0
|
||||
message:
|
||||
.ascii "Boot Test Passed Successfully\n" SUCCESSFUL_BOOT_STRING "\n"
|
||||
messageend:
|
5
tests/boot/linux.cfg
Normal file
5
tests/boot/linux.cfg
Normal file
|
@ -0,0 +1,5 @@
|
|||
linux /linux console=ttyS0 root=/dev/ram0
|
||||
initrd /initrd
|
||||
boot
|
||||
# Shouln't happen
|
||||
halt
|
55
tests/boot/linux.init-i386.S
Normal file
55
tests/boot/linux.init-i386.S
Normal file
|
@ -0,0 +1,55 @@
|
|||
/*
|
||||
* 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 SYSCALL_WRITE 4
|
||||
#define SYSCALL_RESET 88
|
||||
#define SYSCALL_EXIT 1
|
||||
#define SYSCALL_INT 0x80
|
||||
|
||||
#define STDOUT 1
|
||||
#define SHUTDOWN_MAGIC1 0xfee1dead
|
||||
#define SHUTDOWN_MAGIC2 0x28121969
|
||||
#define SHUTDOWN_MAGIC3 0x4321fedc
|
||||
|
||||
.text
|
||||
.global start, _start
|
||||
_start:
|
||||
start:
|
||||
/* write. */
|
||||
movl $SYSCALL_WRITE, %eax
|
||||
movl $STDOUT, %ebx
|
||||
leal message, %ecx
|
||||
movl $(messageend-message), %edx
|
||||
int $SYSCALL_INT
|
||||
|
||||
/* shutdown. */
|
||||
movl $SYSCALL_RESET, %eax
|
||||
movl $SHUTDOWN_MAGIC1, %ebx
|
||||
movl $SHUTDOWN_MAGIC2, %ecx
|
||||
movl $SHUTDOWN_MAGIC3, %edx
|
||||
int $SYSCALL_INT
|
||||
|
||||
/* exit (1). Shouldn't be reached. */
|
||||
movl $SYSCALL_EXIT, %eax
|
||||
movl $1, %ebx
|
||||
int $SYSCALL_INT
|
||||
.data
|
||||
message:
|
||||
.ascii "Boot Test Passed Successfully\n" SUCCESSFUL_BOOT_STRING "\n"
|
||||
messageend:
|
||||
|
54
tests/boot/linux.init-x86_64.S
Normal file
54
tests/boot/linux.init-x86_64.S
Normal file
|
@ -0,0 +1,54 @@
|
|||
/*
|
||||
* 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 SYSCALL_WRITE 1
|
||||
#define SYSCALL_RESET 169
|
||||
#define SYSCALL_EXIT 60
|
||||
|
||||
#define STDOUT 1
|
||||
#define SHUTDOWN_MAGIC1 0xfee1dead
|
||||
#define SHUTDOWN_MAGIC2 0x28121969
|
||||
#define SHUTDOWN_MAGIC3 0x4321fedc
|
||||
|
||||
.text
|
||||
.global start, _start
|
||||
_start:
|
||||
start:
|
||||
/* write. */
|
||||
movq $SYSCALL_WRITE, %rax
|
||||
movq $STDOUT, %rdi
|
||||
leaq message, %rsi
|
||||
movq $(messageend-message), %rdx
|
||||
syscall
|
||||
|
||||
/* shutdown. */
|
||||
movq $SYSCALL_RESET, %rax
|
||||
movq $SHUTDOWN_MAGIC1, %rdi
|
||||
movq $SHUTDOWN_MAGIC2, %rsi
|
||||
movq $SHUTDOWN_MAGIC3, %rdx
|
||||
syscall
|
||||
|
||||
/* exit(1). Shouldn't be reached. */
|
||||
movq $SYSCALL_EXIT, %rax
|
||||
movq $1, %rdi
|
||||
syscall
|
||||
.data
|
||||
message:
|
||||
.ascii "Boot Test Passed Successfully\n" SUCCESSFUL_BOOT_STRING "\n"
|
||||
messageend:
|
||||
|
5
tests/boot/linux16.cfg
Normal file
5
tests/boot/linux16.cfg
Normal file
|
@ -0,0 +1,5 @@
|
|||
linux16 /linux console=ttyS0 root=/dev/ram0
|
||||
initrd16 /initrd
|
||||
boot
|
||||
# Shouln't happen
|
||||
halt
|
|
@ -1,3 +1,21 @@
|
|||
/*
|
||||
* 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/>.
|
||||
*/
|
||||
|
||||
/* All tests need to include test.h for GRUB testing framework. */
|
||||
#include <grub/test.h>
|
||||
|
||||
|
|
|
@ -1,3 +1,21 @@
|
|||
/*
|
||||
* 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/>.
|
||||
*/
|
||||
|
||||
/* Unit tests are normal programs, so they can include C library. */
|
||||
#include <string.h>
|
||||
|
||||
|
|
|
@ -1,3 +1,21 @@
|
|||
/*
|
||||
* 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/>.
|
||||
*/
|
||||
|
||||
#include <grub/mm.h>
|
||||
#include <grub/misc.h>
|
||||
#include <grub/extcmd.h>
|
||||
|
|
|
@ -1,3 +1,21 @@
|
|||
/*
|
||||
* 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/>.
|
||||
*/
|
||||
|
||||
#include <grub/mm.h>
|
||||
#include <grub/misc.h>
|
||||
#include <grub/test.h>
|
||||
|
|
|
@ -1,3 +1,21 @@
|
|||
/*
|
||||
* 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/>.
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <stdarg.h>
|
||||
|
|
|
@ -44,7 +44,9 @@ Run GRUB script in a Qemu instance.
|
|||
-v, --version print the version information and exit
|
||||
--boot=[fd|hd|cd] boot method for Qemu instance
|
||||
--modules=MODULES pre-load specified modules MODULES
|
||||
--qemu=FILE Name of qemu binary
|
||||
--qemu-opts=OPTIONS extra options to pass to Qemu instance
|
||||
--files=FILES add files to the image
|
||||
|
||||
$0 runs input GRUB script or SOURCE file in a Qemu instance and prints
|
||||
its output.
|
||||
|
@ -53,6 +55,9 @@ Report bugs to <bug-grub@gnu.org>.
|
|||
EOF
|
||||
}
|
||||
|
||||
boot=bios-hd
|
||||
qemu=qemu-system-i386
|
||||
|
||||
# Check the arguments.
|
||||
for option in "$@"; do
|
||||
case "$option" in
|
||||
|
@ -65,14 +70,19 @@ for option in "$@"; do
|
|||
--modules=*)
|
||||
ms=`echo "$option" | sed -e 's/--modules=//' -e 's/,/ /g'`
|
||||
modules="$modules $ms" ;;
|
||||
--files=*)
|
||||
fls=`echo "$option" | sed -e 's/--files=//' -e 's/,/ /g'`
|
||||
files="$files $fls" ;;
|
||||
--qemu=*)
|
||||
qemu=`echo "$option" | sed -e 's/--qemu=//' -e 's/,/ /g'`;;
|
||||
--qemu-opts=*)
|
||||
qs=`echo "$option" | sed -e 's/--qemu-opts=//'`
|
||||
qemuopts="$qemuopts $qs" ;;
|
||||
--boot=*)
|
||||
dev=`echo "$option" | sed -e 's/--boot=//'`
|
||||
if [ "$dev" = "fd" ] ; then bootdev=a;
|
||||
elif [ "$dev" = "hd" ] ; then bootdev=c;
|
||||
elif [ "$dev" = "cd" ] ; then bootdev=d;
|
||||
if [ "$dev" = "bios-fd" ] ; then boot=bios-fd;
|
||||
elif [ "$dev" = "bios-hd" ] ; then boot=bios-hd;
|
||||
elif [ "$dev" = "bios-cd" ] ; then boot=bios-cd;
|
||||
else
|
||||
echo "Unrecognized boot method \`$dev'" 1>&2
|
||||
usage
|
||||
|
@ -100,10 +110,6 @@ if [ "x${source}" = x ] ; then
|
|||
source=${tmpfile}
|
||||
fi
|
||||
|
||||
if [ "x${bootdev}" = x ] ; then
|
||||
bootdev=c # default is boot as disk image
|
||||
fi
|
||||
|
||||
cfgfile=`mktemp`
|
||||
cat <<EOF >${cfgfile}
|
||||
grubshell=yes
|
||||
|
@ -123,23 +129,28 @@ source /boot/grub/testcase.cfg
|
|||
halt
|
||||
EOF
|
||||
|
||||
isofile=`mktemp`
|
||||
grub-mkrescue --output=${isofile} --override-directory=${builddir} \
|
||||
/boot/grub/grub.cfg=${cfgfile} /boot/grub/testcase.cfg=${source} \
|
||||
>/dev/null 2>&1
|
||||
if [ x$boot = xbios-hd ] || [ x$boot = xbios-fd ] || [ x$boot = xbios-cd ]; then
|
||||
isofile=`mktemp`
|
||||
grub-mkrescue --output=${isofile} --override-directory=${builddir} \
|
||||
/boot/grub/grub.cfg=${cfgfile} /boot/grub/testcase.cfg=${source} \
|
||||
${files} >/dev/null 2>&1
|
||||
if [ x$boot = xbios-hd ]; then
|
||||
device=hda
|
||||
bootdev=c
|
||||
fi
|
||||
if [ x$boot = xbios-cd ]; then
|
||||
device=cdrom
|
||||
bootdev=d
|
||||
fi
|
||||
if [ x$boot = xbios-fd ]; then
|
||||
device=fda
|
||||
bootdev=a
|
||||
fi
|
||||
${qemu} ${qemuopts} -nographic -serial file:/dev/stdout -monitor file:/dev/null -${device} ${isofile} -boot ${bootdev} | tr -d "\r"
|
||||
rm -f ${isofile}
|
||||
fi
|
||||
|
||||
hdafile=`mktemp`
|
||||
cp ${isofile} ${hdafile}
|
||||
|
||||
fdafile=`mktemp`
|
||||
cp ${isofile} ${fdafile}
|
||||
|
||||
outfile=`mktemp`
|
||||
qemu-system-i386 ${qemuopts} -nographic -serial stdio -hda ${hdafile} -fda ${fdafile} -cdrom ${isofile} -boot ${bootdev} | tr -d "\r" >${outfile}
|
||||
|
||||
cat $outfile
|
||||
|
||||
rm -f ${tmpfile} ${outfile} ${cfgfile} ${isofile} ${hdafile} ${fdafile}
|
||||
rm -f ${tmpfile} ${cfgfile}
|
||||
exit 0
|
||||
|
||||
|
||||
|
|
Loading…
Reference in a new issue