vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Core compression test.

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-04-27 19:44:00 +02:00
parent 17f9fd29d3
commit e7b8fd08c5
4 changed files with 26 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2013-04-27 Vladimir Serbinenko <phcoder@gmail.com>
Core compression test.
2013-04-27 Vladimir Serbinenko <phcoder@gmail.com> 2013-04-27 Vladimir Serbinenko <phcoder@gmail.com>
Implement grub_machine_get_bootlocation for ARC. Implement grub_machine_get_bootlocation for ARC.

6
Makefile.util.def
View file

@ -718,6 +718,12 @@ script = {
common = tests/pseries_test.in; common = tests/pseries_test.in;
}; };
script = {
testcase;
name = core_compress_test;
common = tests/core_compress_test.in;
};
script = { script = {
testcase; testcase;
name = xzcompress_test; name = xzcompress_test;

10
tests/util/grub-shell.in
View file

@ -177,6 +177,7 @@ case "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" in
esac esac
timeout=60 timeout=60
mkimage_extra_arg=
# Check the arguments. # Check the arguments.
for option in "$@"; do for option in "$@"; do
@ -236,6 +237,13 @@ for option in "$@"; do
--timeout=*) --timeout=*)
timeout=`echo "$option" | sed -e 's/--timeout=//'` timeout=`echo "$option" | sed -e 's/--timeout=//'`
;; ;;
# Intentionally undocumented
--grub-mkimage-extra)
mkimage_extra_arg="$mkimage_extra_arg `argument $option "$@"`"; shift ;;
--grub-mkimage-extra=*)
mkimage_extra_arg="$mkimage_extra_arg `echo "$option" | sed 's/--grub-mkimage-extra=//'`" ;;
--boot=*) --boot=*)
dev=`echo "$option" | sed -e 's/--boot=//'` dev=`echo "$option" | sed -e 's/--boot=//'`
if [ "$dev" = "fd" ] ; then boot=fd; if [ "$dev" = "fd" ] ; then boot=fd;
@ -325,7 +333,7 @@ echo "${halt_cmd}" >>${cfgfile}
isofile=`mktemp "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"` || exit 1 isofile=`mktemp "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"` || exit 1
if [ x$boot != xnet ] && [ x$boot != xemu ]; then if [ x$boot != xnet ] && [ x$boot != xemu ]; then
pkgdatadir="@builddir@" sh "@builddir@/grub-mkrescue" "--grub-mkimage=${builddir}/grub-mkimage" "--grub-render-label=${builddir}/grub-render-label" "--output=${isofile}" "--override-directory=${builddir}/grub-core" \ pkgdatadir="@builddir@" sh "@builddir@/grub-mkrescue" "--grub-mkimage=${builddir}/grub-mkimage" "--grub-render-label=${builddir}/grub-render-label" "--output=${isofile}" "--override-directory=${builddir}/grub-core" \
--rom-directory="${rom_directory}" ${mkrescue_args} \ --rom-directory="${rom_directory}" "--grub-mkimage-extra=$mkimage_extra_arg" ${mkrescue_args} \
"/boot/grub/grub.cfg=${cfgfile}" "/boot/grub/testcase.cfg=${source}" \ "/boot/grub/grub.cfg=${cfgfile}" "/boot/grub/testcase.cfg=${source}" \
${files} >/dev/null 2>&1 ${files} >/dev/null 2>&1
fi fi

7
util/grub-mkrescue.in
View file

@ -105,6 +105,7 @@ usage () {
} }
system_area=auto system_area=auto
mkimage_extra_arg=
# Check the arguments. # Check the arguments.
while test $# -gt 0 while test $# -gt 0
@ -154,6 +155,12 @@ do
export PATH export PATH
;; ;;
# Intentionally undocumented
--grub-mkimage-extra)
mkimage_extra_arg="$mkimage_extra_arg `argument $option "$@"`"; shift ;;
--grub-mkimage-extra=*)
mkimage_extra_arg="$mkimage_extra_arg `echo "$option" | sed 's/--grub-mkimage-extra=//'`" ;;
--sparc-boot) --sparc-boot)
system_area=sparc64 ;; system_area=sparc64 ;;