From: Vladimir Serbinenko <phcoder@gmail.com>
Date: Fri, 27 Jan 2017 17:46:47 +0000 (+0000)
Subject: grub-fs-tester: Accomodate for testing in proot containers.
X-Git-Tag: 2.02-rc1~38
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bf0e59cebff53b33674cb13cf18255686c288c57;p=thirdparty%2Fgrub.git

grub-fs-tester: Accomodate for testing in proot containers.

proot creates hidden files with .proot prefix and name
derived from real file name. So decrease file name length
and path depth. For some reason depth 85 also results in
undeleteable directory, so use 84 instead of 85.
---

diff --git a/tests/util/grub-fs-tester.in b/tests/util/grub-fs-tester.in
index 424de2267..986f6677a 100644
--- a/tests/util/grub-fs-tester.in
+++ b/tests/util/grub-fs-tester.in
@@ -251,7 +251,7 @@ for ((LOGSECSIZE=MINLOGSECSIZE;LOGSECSIZE<=MAXLOGSECSIZE;LOGSECSIZE=LOGSECSIZE +
 		    CFILES[0]="american-english";;
 	    esac
         # OS LIMITATION: Limited by NAME_MAX (usually 255) in GNU/Linux
-	    LONGNAME="qwertzuiopasdfghjklyxcvbnm1234567890qwertzuiopasdfghjklyxcvbnm1234567890oiewqfiewioqoiqoiurqruewqoiuwoieoiiuewqroreqiufieiuwrnureweriuvceoiroiewqoiricdsalkcndsakfirefoiwqeoircorejwoijfreoijojoiewjfwnfcoirenfoirefnreoifenoiwfnoirewoifoiwqwoieqfrqwioerijewr"
+	    LONGNAME="qwertzuiopasdfghjklyxcvbnm1234567890qwertzuiopasdfghjklyxcvbnm1234567890oiewqfiewioqoiqoiurqruewqoiuwoieoiiuewqroreqiufieiuwrnureweriuvceoiroiewqoiricdsalkcndsakfirefoiwqeoircorejwoijfreoijojoiewjfwnfcoirenfoirefnreoifenoiwfnoi"
 	    rm -rf "$MASTER"
 
 	    case x"$fs" in
@@ -498,8 +498,8 @@ for ((LOGSECSIZE=MINLOGSECSIZE;LOGSECSIZE<=MAXLOGSECSIZE;LOGSECSIZE=LOGSECSIZE +
 		    NOFSLABEL=y;;
 	    esac
 
-	    PDIRCOMPNUM=220
-	    PDIR2COMPNUM=220
+	    PDIRCOMPNUM=210
+	    PDIR2COMPNUM=210
 
 	    case x$fs in
 		    # OS LIMITATION: bfs_fuse bugs beyond that
@@ -514,7 +514,7 @@ for ((LOGSECSIZE=MINLOGSECSIZE;LOGSECSIZE<=MAXLOGSECSIZE;LOGSECSIZE=LOGSECSIZE +
 		    # FS LIMITATION: at most 255 on path length
 		    # FS LIMITATION: at most 100 on symlink length
 		xcpio_ustar)
-		    PDIRCOMPNUM=85
+		    PDIRCOMPNUM=84
 		    PDIR2COMPNUM=30;;
 		    # OS LIMITATION: Linux supports only symlink at most one block long on reiserfs
 		xreiserfs | xreiserfs_old)