From 60870be86cd4b54bfdd6bcd08b82b9a99f19b812 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Mon, 18 Nov 2013 16:16:33 +0000
Subject: [PATCH] * tests/gzcompress_test.in: Skip if gzip is not installed
 (unlikely, but for symmetry). * tests/lzocompress_test.in: Skip if lzop is
 not installed. * tests/xzcompress_test.in: Skip if xz is not installed.

---
 ChangeLog                 | 7 +++++++
 tests/gzcompress_test.in  | 5 +++++
 tests/lzocompress_test.in | 5 +++++
 tests/xzcompress_test.in  | 5 +++++
 4 files changed, 22 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index aa39cb968..7f7941601 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2013-11-18  Colin Watson  <cjwatson@ubuntu.com>
+
+	* tests/gzcompress_test.in: Skip if gzip is not installed (unlikely,
+	but for symmetry).
+	* tests/lzocompress_test.in: Skip if lzop is not installed.
+	* tests/xzcompress_test.in: Skip if xz is not installed.
+
 2013-11-18  Colin Watson  <cjwatson@ubuntu.com>
 
 	* util/grub-mkrescue.c (main): Fix typo.
diff --git a/tests/gzcompress_test.in b/tests/gzcompress_test.in
index 5cc352eef..11b6bb208 100644
--- a/tests/gzcompress_test.in
+++ b/tests/gzcompress_test.in
@@ -19,6 +19,11 @@ grubshell=@builddir@/grub-shell
 
 . "@builddir@/grub-core/modinfo.sh"
 
+if ! which gzip >/dev/null 2>&1; then
+   echo "gzip not installed; cannot test gzip compression."
+   exit 77
+fi
+
 if [ "$(echo hello | "${grubshell}" --mkrescue-arg=--compress=gz)" != "Hello World" ]; then
    exit 1
 fi
diff --git a/tests/lzocompress_test.in b/tests/lzocompress_test.in
index 54428c33b..41984c254 100644
--- a/tests/lzocompress_test.in
+++ b/tests/lzocompress_test.in
@@ -19,6 +19,11 @@ grubshell=@builddir@/grub-shell
 
 . "@builddir@/grub-core/modinfo.sh"
 
+if ! which lzop >/dev/null 2>&1; then
+   echo "lzop not installed; cannot test lzo compression."
+   exit 77
+fi
+
 if [ "$(echo hello | "${grubshell}" --mkrescue-arg=--compress=lzo)" != "Hello World" ]; then
    exit 1
 fi
diff --git a/tests/xzcompress_test.in b/tests/xzcompress_test.in
index 63f5fd190..b2bd999ec 100644
--- a/tests/xzcompress_test.in
+++ b/tests/xzcompress_test.in
@@ -19,6 +19,11 @@ grubshell=@builddir@/grub-shell
 
 . "@builddir@/grub-core/modinfo.sh"
 
+if ! which xz >/dev/null 2>&1; then
+   echo "xz not installed; cannot test xz compression."
+   exit 77
+fi
+
 if [ "$(echo hello | "${grubshell}" --mkrescue-arg=--compress=xz)" != "Hello World" ]; then
    exit 1
 fi