|
 |
bc092b9 |
From 6dec3a26b37e128ded5d912e08abc5cee1592499 Mon Sep 17 00:00:00 2001
|
|
|
bc092b9 |
From: Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
bc092b9 |
Date: Mon, 23 Jan 2017 21:24:05 +0300
|
|
|
bc092b9 |
Subject: [PATCH 005/176] Don't retrieve fstime when it's not useful.
|
|
|
bc092b9 |
|
|
|
bc092b9 |
---
|
|
|
bc092b9 |
tests/util/grub-fs-tester.in | 48 ++++++++++++++++++++++----------------------
|
|
|
bc092b9 |
1 file changed, 24 insertions(+), 24 deletions(-)
|
|
|
bc092b9 |
|
|
|
bc092b9 |
diff --git a/tests/util/grub-fs-tester.in b/tests/util/grub-fs-tester.in
|
|
|
bc092b9 |
index 4515d165e..bf47305f3 100644
|
|
|
bc092b9 |
--- a/tests/util/grub-fs-tester.in
|
|
|
bc092b9 |
+++ b/tests/util/grub-fs-tester.in
|
|
|
bc092b9 |
@@ -1328,31 +1328,31 @@ for LOGSECSIZE in $(range "$MINLOGSECSIZE" "$MAXLOGSECSIZE" 1); do
|
|
|
bc092b9 |
;;
|
|
|
bc092b9 |
esac
|
|
|
bc092b9 |
|
|
|
bc092b9 |
- case x$fs in
|
|
|
bc092b9 |
- xiso9660 | xziso9660 | xrockridge | xjoliet | xrockridge_joliet | xiso9660_1999 | xrockridge_1999 | xjoliet_1999 | xrockridge_joliet_1999)
|
|
|
bc092b9 |
- FSTIME="$(date -d "$(echo ${FSUUID} | awk -F - '{ print $1"-"$2"-"$3" "$4":"$5":"$6 ;}')" '+%Y-%m-%d %H:%M:%S')";;
|
|
|
bc092b9 |
- xlvm*|xmdraid*)
|
|
|
bc092b9 |
- # With some abstractions like mdraid flushing to disk
|
|
|
bc092b9 |
- # may be delayed for a long time.
|
|
|
bc092b9 |
- FSTIME="$UMOUNT_TIME";;
|
|
|
bc092b9 |
- *)
|
|
|
bc092b9 |
- FSTIME="$(TZ=UTC ls --time-style="+%Y-%m-%d_%H:%M:%S" -l -d "${FSIMAGEP}0.img"|awk '{print $6; }'|sed 's,_, ,g')";;
|
|
|
bc092b9 |
- esac
|
|
|
bc092b9 |
- # With some abstractions like mdraid computing of UMOUNT_TIME
|
|
|
bc092b9 |
- # is not precise. Account for small difference here.
|
|
|
bc092b9 |
- FSTIMEM1="$(date -d "$FSTIME UTC -1 second" -u "+%Y-%m-%d %H:%M:%S")"
|
|
|
bc092b9 |
- FSTIMEM2="$(date -d "$FSTIME UTC -2 second" -u "+%Y-%m-%d %H:%M:%S")"
|
|
|
bc092b9 |
- FSTIMEM3="$(date -d "$FSTIME UTC -3 second" -u "+%Y-%m-%d %H:%M:%S")"
|
|
|
bc092b9 |
+ if [ x$NOFSTIME != xy ]; then
|
|
|
bc092b9 |
+ case x$fs in
|
|
|
bc092b9 |
+ xiso9660 | xziso9660 | xrockridge | xjoliet | xrockridge_joliet | xiso9660_1999 | xrockridge_1999 | xjoliet_1999 | xrockridge_joliet_1999)
|
|
|
bc092b9 |
+ FSTIME="$(date -d "$(echo ${FSUUID} | awk -F - '{ print $1"-"$2"-"$3" "$4":"$5":"$6 ;}')" '+%Y-%m-%d %H:%M:%S')";;
|
|
|
bc092b9 |
+ xlvm*|xmdraid*)
|
|
|
bc092b9 |
+ # With some abstractions like mdraid flushing to disk
|
|
|
bc092b9 |
+ # may be delayed for a long time.
|
|
|
bc092b9 |
+ FSTIME="$UMOUNT_TIME";;
|
|
|
bc092b9 |
+ *)
|
|
|
bc092b9 |
+ FSTIME="$(TZ=UTC ls --time-style="+%Y-%m-%d_%H:%M:%S" -l -d "${FSIMAGEP}0.img"|awk '{print $6; }'|sed 's,_, ,g')";;
|
|
|
bc092b9 |
+ esac
|
|
|
bc092b9 |
+ # With some abstractions like mdraid computing of UMOUNT_TIME
|
|
|
bc092b9 |
+ # is not precise. Account for small difference here.
|
|
|
bc092b9 |
+ FSTIMEM1="$(date -d "$FSTIME UTC -1 second" -u "+%Y-%m-%d %H:%M:%S")"
|
|
|
bc092b9 |
+ FSTIMEM2="$(date -d "$FSTIME UTC -2 second" -u "+%Y-%m-%d %H:%M:%S")"
|
|
|
bc092b9 |
+ FSTIMEM3="$(date -d "$FSTIME UTC -3 second" -u "+%Y-%m-%d %H:%M:%S")"
|
|
|
bc092b9 |
|
|
|
bc092b9 |
- if [ x$NOFSTIME = xy ]; then
|
|
|
bc092b9 |
- :
|
|
|
bc092b9 |
- elif echo "$LSOUT" | grep -F 'Last modification time '"$FSTIME" > /dev/null || echo "$LSOUT" | grep -F 'Last modification time '"$FSTIMEM1" > /dev/null || echo "$LSOUT" | grep -F 'Last modification time '"$FSTIMEM2" || echo "$LSOUT" | grep -F 'Last modification time '"$FSTIMEM3" > /dev/null; then
|
|
|
bc092b9 |
- :
|
|
|
bc092b9 |
- else
|
|
|
bc092b9 |
- echo FSTIME FAIL
|
|
|
bc092b9 |
- echo "$FSTIME"
|
|
|
bc092b9 |
- echo "$LSOUT"
|
|
|
bc092b9 |
- exit 1
|
|
|
bc092b9 |
+ if echo "$LSOUT" | grep -F 'Last modification time '"$FSTIME" > /dev/null || echo "$LSOUT" | grep -F 'Last modification time '"$FSTIMEM1" > /dev/null || echo "$LSOUT" | grep -F 'Last modification time '"$FSTIMEM2" || echo "$LSOUT" | grep -F 'Last modification time '"$FSTIMEM3" > /dev/null; then
|
|
|
bc092b9 |
+ :
|
|
|
bc092b9 |
+ else
|
|
|
bc092b9 |
+ echo FSTIME FAIL
|
|
|
bc092b9 |
+ echo "$FSTIME"
|
|
|
bc092b9 |
+ echo "$LSOUT"
|
|
|
bc092b9 |
+ exit 1
|
|
|
bc092b9 |
+ fi
|
|
|
bc092b9 |
fi
|
|
|
bc092b9 |
|
|
|
bc092b9 |
if [ x$NOHARDLINK != xy ]; then
|
|
|
bc092b9 |
--
|
|
|
bc092b9 |
2.13.0
|
|
|
bc092b9 |
|