From: Vladimir Serbinenko <phcoder@gmail.com>
Date: Thu, 23 Jul 2015 23:17:04 +0000 (+0200)
Subject: zfs_test: Skip dotdot in volume root test.
X-Git-Tag: 2.02-beta3~237
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=333855c6469d52a7a555ea55834182603981ea0e;p=thirdparty%2Fgrub.git

zfs_test: Skip dotdot in volume root test.

Given special semantics of ZFS it's far from clear what the expected
result is. Just skip it for now
---

diff --git a/tests/util/grub-fs-tester.in b/tests/util/grub-fs-tester.in
index 6fcac31c3..29ae69153 100644
--- a/tests/util/grub-fs-tester.in
+++ b/tests/util/grub-fs-tester.in
@@ -1149,18 +1149,19 @@ for ((LOGSECSIZE=MINLOGSECSIZE;LOGSECSIZE<=MAXLOGSECSIZE;LOGSECSIZE=LOGSECSIZE +
 
 	    case x"$fs" in
 		x"zfs"*)
-		    LSROUT=$(run_grubfstest ls -- -la "($GRUBDEVICE)/grub fs@/..");;
+		    ;;
 		*)
-		    LSROUT=$(run_grubfstest ls -- -la "($GRUBDEVICE)/..");;
+		    LSROUT=$(run_grubfstest ls -- -la "($GRUBDEVICE)/..");
+		    if echo "$LSROUT" | grep -F " $BASEFILE" | grep "$BLOCKCNT" > /dev/null; then
+			:
+		    else
+			echo DOTDOT IN ROOTDIR FAIL
+			echo "$LSROUT"
+			TZ=UTC ls --time-style=+%Y%m%d%H%M%S.%N -l "$MNTPOINTRO"
+			exit 1
+		    fi
+		    ;;
 	    esac
-	    if echo "$LSROUT" | grep -F " $BASEFILE" | grep "$BLOCKCNT" > /dev/null; then
-		:
-	    else
-		echo DOTDOT IN ROOTDIR FAIL
-		echo "$LSROUT"
-		TZ=UTC ls --time-style=+%Y%m%d%H%M%S.%N -l "$MNTPOINTRO"
-		exit 1
-	    fi
 
 	    case x"$fs" in
 		x"zfs"*)