Core compression test.

diff --git a/ChangeLog b/ChangeLog
index 09a6c70afe6f6955868fc8314d44fa94f270f168..67099391ec61dfb499a66a8250904277dfc3df70 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-04-27  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       Core compression test.
+
 2013-04-27  Vladimir Serbinenko  <phcoder@gmail.com>
 
        Implement grub_machine_get_bootlocation for ARC.

diff --git a/Makefile.util.def b/Makefile.util.def
index 1b71fd07fa9b8af29cdb25cef4db5e8a2df69610..caa6c059ce1411a7b80ae351fca3c1c2d45415d0 100644 (file)
--- a/Makefile.util.def
+++ b/Makefile.util.def
@@ -718,6 +718,12 @@ script = {
   common = tests/pseries_test.in;
 };
 
+script = {
+  testcase;
+  name = core_compress_test;
+  common = tests/core_compress_test.in;
+};
+
 script = {
   testcase;
   name = xzcompress_test;

diff --git a/tests/util/grub-shell.in b/tests/util/grub-shell.in
index e00998a8e8da62ba1e1bd276335aa7842e7274b1..b034e96a35861482bd0f53bc2d407988cfc75eb3 100644 (file)
--- a/tests/util/grub-shell.in
+++ b/tests/util/grub-shell.in
@@ -177,6 +177,7 @@ case "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" in
 esac
 
 timeout=60
+mkimage_extra_arg=
 
 # Check the arguments.
 for option in "$@"; do
@@ -236,6 +237,13 @@ for option in "$@"; do
     --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=*)
         dev=`echo "$option" | sed -e 's/--boot=//'`
        if   [ "$dev" = "fd" ] ; then boot=fd;
@@ -325,7 +333,7 @@ echo "${halt_cmd}" >>${cfgfile}
 isofile=`mktemp "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"` || exit 1
 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" \
-       --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}" \
        ${files} >/dev/null 2>&1
 fi

diff --git a/util/grub-mkrescue.in b/util/grub-mkrescue.in
index f2b24b4d5baa9d3407dd3d10557df9ceeb01e82e..eab621e292ec23b587785b105d887bbf420e144d 100644 (file)
--- a/util/grub-mkrescue.in
+++ b/util/grub-mkrescue.in
@@ -105,6 +105,7 @@ usage () {
 }
 
 system_area=auto
+mkimage_extra_arg=
 
 # Check the arguments.
 while test $# -gt 0
@@ -154,6 +155,12 @@ do
        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)
         system_area=sparc64 ;;