8c6b1ac71e
Also include some minor fixes for gcc 5.1.1 Signed-off-by: Peter Jones <pjones@redhat.com>
48 lines
1.4 KiB
Diff
48 lines
1.4 KiB
Diff
From e2dd6daa8c33e3e7641e442dc269fcca479c6fda Mon Sep 17 00:00:00 2001
|
|
From: Andrei Borzenkov <arvidjaar@gmail.com>
|
|
Date: Thu, 20 Nov 2014 20:56:51 +0300
|
|
Subject: [PATCH 116/506] grub-fs-tester: consistently print output of grub ls
|
|
if test fails
|
|
|
|
---
|
|
ChangeLog | 5 +++++
|
|
tests/util/grub-fs-tester.in | 2 ++
|
|
2 files changed, 7 insertions(+)
|
|
|
|
diff --git a/ChangeLog b/ChangeLog
|
|
index b86feea..6fbec06 100644
|
|
--- a/ChangeLog
|
|
+++ b/ChangeLog
|
|
@@ -1,3 +1,8 @@
|
|
+2014-11-20 Andrei Borzenkov <arvidjaar@gmail.com>
|
|
+
|
|
+ * tests/util/grub-fs-tester.in: Consistently print output
|
|
+ of grub ls if test fails.
|
|
+
|
|
2014-11-07 Leif Lindholm <leif.lindholm@linaro.org>
|
|
|
|
* grub-core/kern/efi/init.c: check value of *path before
|
|
diff --git a/tests/util/grub-fs-tester.in b/tests/util/grub-fs-tester.in
|
|
index 669527a..5656927 100644
|
|
--- a/tests/util/grub-fs-tester.in
|
|
+++ b/tests/util/grub-fs-tester.in
|
|
@@ -1065,6 +1065,7 @@ for ((LOGSECSIZE=MINLOGSECSIZE;LOGSECSIZE<=MAXLOGSECSIZE;LOGSECSIZE=LOGSECSIZE +
|
|
:
|
|
else
|
|
echo NLIST FAIL
|
|
+ echo "$LSROUT"
|
|
TZ=UTC ls --time-style=+%Y%m%d%H%M%S.%N -lA "$MNTPOINTRO"
|
|
exit 1
|
|
fi
|
|
@@ -1082,6 +1083,7 @@ for ((LOGSECSIZE=MINLOGSECSIZE;LOGSECSIZE<=MAXLOGSECSIZE;LOGSECSIZE=LOGSECSIZE +
|
|
:
|
|
else
|
|
echo LONG LIST FAIL
|
|
+ echo "$LSROUT"
|
|
TZ=UTC ls --time-style=+%Y%m%d%H%M%S.%N -l "$MNTPOINTRO"
|
|
exit 1
|
|
fi
|
|
--
|
|
2.4.3
|
|
|