|
 |
31004e6 |
From 795dd1f8388ba8472781a001ab1c832091dffc54 Mon Sep 17 00:00:00 2001
|
|
|
31004e6 |
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
|
|
|
31004e6 |
Date: Sat, 27 Apr 2013 19:44:00 +0200
|
|
|
f74b50e |
Subject: [PATCH 364/482] Core compression test.
|
|
|
31004e6 |
|
|
|
31004e6 |
---
|
|
|
31004e6 |
ChangeLog | 4 ++++
|
|
|
31004e6 |
Makefile.util.def | 6 ++++++
|
|
|
31004e6 |
tests/util/grub-shell.in | 10 +++++++++-
|
|
|
31004e6 |
util/grub-mkrescue.in | 7 +++++++
|
|
|
31004e6 |
4 files changed, 26 insertions(+), 1 deletion(-)
|
|
|
31004e6 |
|
|
|
31004e6 |
diff --git a/ChangeLog b/ChangeLog
|
|
|
31004e6 |
index 09a6c70..6709939 100644
|
|
|
31004e6 |
--- a/ChangeLog
|
|
|
31004e6 |
+++ b/ChangeLog
|
|
|
31004e6 |
@@ -1,5 +1,9 @@
|
|
|
31004e6 |
2013-04-27 Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
31004e6 |
|
|
|
31004e6 |
+ Core compression test.
|
|
|
31004e6 |
+
|
|
|
31004e6 |
+2013-04-27 Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
31004e6 |
+
|
|
|
31004e6 |
Implement grub_machine_get_bootlocation for ARC.
|
|
|
31004e6 |
|
|
|
31004e6 |
2013-04-27 Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
31004e6 |
diff --git a/Makefile.util.def b/Makefile.util.def
|
|
|
31004e6 |
index 1b71fd0..caa6c05 100644
|
|
|
31004e6 |
--- a/Makefile.util.def
|
|
|
31004e6 |
+++ b/Makefile.util.def
|
|
|
31004e6 |
@@ -720,6 +720,12 @@ script = {
|
|
|
31004e6 |
|
|
|
31004e6 |
script = {
|
|
|
31004e6 |
testcase;
|
|
|
31004e6 |
+ name = core_compress_test;
|
|
|
31004e6 |
+ common = tests/core_compress_test.in;
|
|
|
31004e6 |
+};
|
|
|
31004e6 |
+
|
|
|
31004e6 |
+script = {
|
|
|
31004e6 |
+ testcase;
|
|
|
31004e6 |
name = xzcompress_test;
|
|
|
31004e6 |
common = tests/xzcompress_test.in;
|
|
|
31004e6 |
};
|
|
|
31004e6 |
diff --git a/tests/util/grub-shell.in b/tests/util/grub-shell.in
|
|
|
31004e6 |
index e00998a..b034e96 100644
|
|
|
31004e6 |
--- a/tests/util/grub-shell.in
|
|
|
31004e6 |
+++ b/tests/util/grub-shell.in
|
|
|
31004e6 |
@@ -177,6 +177,7 @@ case "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" in
|
|
|
31004e6 |
esac
|
|
|
31004e6 |
|
|
|
31004e6 |
timeout=60
|
|
|
31004e6 |
+mkimage_extra_arg=
|
|
|
31004e6 |
|
|
|
31004e6 |
# Check the arguments.
|
|
|
31004e6 |
for option in "$@"; do
|
|
|
31004e6 |
@@ -236,6 +237,13 @@ for option in "$@"; do
|
|
|
31004e6 |
--timeout=*)
|
|
|
31004e6 |
timeout=`echo "$option" | sed -e 's/--timeout=//'`
|
|
|
31004e6 |
;;
|
|
|
31004e6 |
+
|
|
|
31004e6 |
+ # Intentionally undocumented
|
|
|
31004e6 |
+ --grub-mkimage-extra)
|
|
|
31004e6 |
+ mkimage_extra_arg="$mkimage_extra_arg `argument $option "$@"`"; shift ;;
|
|
|
31004e6 |
+ --grub-mkimage-extra=*)
|
|
|
31004e6 |
+ mkimage_extra_arg="$mkimage_extra_arg `echo "$option" | sed 's/--grub-mkimage-extra=//'`" ;;
|
|
|
31004e6 |
+
|
|
|
31004e6 |
--boot=*)
|
|
|
31004e6 |
dev=`echo "$option" | sed -e 's/--boot=//'`
|
|
|
31004e6 |
if [ "$dev" = "fd" ] ; then boot=fd;
|
|
|
31004e6 |
@@ -325,7 +333,7 @@ echo "${halt_cmd}" >>${cfgfile}
|
|
|
31004e6 |
isofile=`mktemp "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"` || exit 1
|
|
|
31004e6 |
if [ x$boot != xnet ] && [ x$boot != xemu ]; then
|
|
|
31004e6 |
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" \
|
|
|
31004e6 |
- --rom-directory="${rom_directory}" ${mkrescue_args} \
|
|
|
31004e6 |
+ --rom-directory="${rom_directory}" "--grub-mkimage-extra=$mkimage_extra_arg" ${mkrescue_args} \
|
|
|
31004e6 |
"/boot/grub/grub.cfg=${cfgfile}" "/boot/grub/testcase.cfg=${source}" \
|
|
|
31004e6 |
${files} >/dev/null 2>&1
|
|
|
31004e6 |
fi
|
|
|
31004e6 |
diff --git a/util/grub-mkrescue.in b/util/grub-mkrescue.in
|
|
|
31004e6 |
index f2b24b4..eab621e 100644
|
|
|
31004e6 |
--- a/util/grub-mkrescue.in
|
|
|
31004e6 |
+++ b/util/grub-mkrescue.in
|
|
|
31004e6 |
@@ -105,6 +105,7 @@ usage () {
|
|
|
31004e6 |
}
|
|
|
31004e6 |
|
|
|
31004e6 |
system_area=auto
|
|
|
31004e6 |
+mkimage_extra_arg=
|
|
|
31004e6 |
|
|
|
31004e6 |
# Check the arguments.
|
|
|
31004e6 |
while test $# -gt 0
|
|
|
31004e6 |
@@ -154,6 +155,12 @@ do
|
|
|
31004e6 |
export PATH
|
|
|
31004e6 |
;;
|
|
|
31004e6 |
|
|
|
31004e6 |
+ # Intentionally undocumented
|
|
|
31004e6 |
+ --grub-mkimage-extra)
|
|
|
31004e6 |
+ mkimage_extra_arg="$mkimage_extra_arg `argument $option "$@"`"; shift ;;
|
|
|
31004e6 |
+ --grub-mkimage-extra=*)
|
|
|
31004e6 |
+ mkimage_extra_arg="$mkimage_extra_arg `echo "$option" | sed 's/--grub-mkimage-extra=//'`" ;;
|
|
|
31004e6 |
+
|
|
|
31004e6 |
--sparc-boot)
|
|
|
31004e6 |
system_area=sparc64 ;;
|
|
|
31004e6 |
|
|
|
31004e6 |
--
|
|
|
31004e6 |
1.8.2.1
|
|
|
31004e6 |
|