]> git.ipfire.org Git - thirdparty/grub.git/commitdiff
zfs_test: Skip dotdot in volume root test.
authorVladimir Serbinenko <phcoder@gmail.com>
Thu, 23 Jul 2015 23:17:04 +0000 (01:17 +0200)
committerVladimir Serbinenko <phcoder@gmail.com>
Thu, 23 Jul 2015 23:23:45 +0000 (01:23 +0200)
Given special semantics of ZFS it's far from clear what the expected
result is. Just skip it for now

tests/util/grub-fs-tester.in

index 6fcac31c3436950736eb2676b0b91329058db170..29ae69153622f56935630ccfbaa7f758ad03529c 100644 (file)
@@ -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"*)