From: Eric Bollengier <eric@baculasystems.com>
Date: Wed, 2 Sep 2020 12:47:52 +0000 (+0200)
Subject: BEE Backport regress/tests/bvfs-restore-test
X-Git-Tag: Release-11.3.2~1294
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bb241fbf288f5e45369509b9817a9e86a6e756b5;p=thirdparty%2Fbacula.git

BEE Backport regress/tests/bvfs-restore-test

This commit is the result of the squash of the following main commits:

Author: Eric Bollengier <eric@baculasystems.com>
Date:   Wed Jul 29 11:29:46 2020 +0200

    regress: Fix for bvfs-restore-test on MySQL
---

diff --git a/regress/tests/bvfs-restore-test b/regress/tests/bvfs-restore-test
index 632ae45fbd..2b2329d0ce 100755
--- a/regress/tests/bvfs-restore-test
+++ b/regress/tests/bvfs-restore-test
@@ -62,13 +62,18 @@ cat <<EOF >$tmp/bconcmds
 .bvfs_lsdirs jobid=1,2,3,4 path=
 @$out $tmp/log3.out
 .bvfs_lsfiles jobid=1,2,3,4 path=$tmp/hl/ pattern=verify.c
+@$out $tmp/log4.out
+.bvfs_lsdirs path=$tmp/ jobid=1 pattern=hl
 quit
 EOF
 
 run_bconsole
 
+# The hl/ directory ID can change, we take it from a bvfs_lsdir
+hldirid=`awk '/hl\/$/ { print $1 }' $tmp/log4.out`
+fid=`awk "/^$hldirid/"' { m=(m>$2)?m:$2 } END { print m }' $tmp/log3.out`
+
 dirid=`awk '/\/$/ { print $1 }' $tmp/log0.out`
-fid=`awk '/^1/ { m=(m>$2)?m:$2 } END { print m }' $tmp/log3.out`
 
 cat <<EOF >$tmp/bconcmds
 @$out $tmp/log2.out