apfs/apfstests
0
0
Fork 0
mirror of https://github.com/linux-apfs/apfstests.git synced 2026-05-01 15:01:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

xfs/195: Use XFSDUMP_PROG instead of xfsdump directly

Browse Source 
Use appropriate environment variable (XFSDUMP_PROG) instead of
hardcoding 'xfsdump' name. Also make the test fail graciously when
xfsdump isn't installed.

We also make XFSDUMP_PROG be equal to empty string instead of -e when
xfsdump isn't installed. The changes require some tweaking to output
filtering since full command path now appears in the output.

Signed-off-by: Jan Kara <jack@suse.cz>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
This commit is contained in:
Jan Kara
2014-11-10 13:05:22 +11:00
committed by Dave Chinner
parent 027bcfa64e
commit fa7f9fb987
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/config
+5 -1
View File
@@ -163,7 +163,11 @@ export XFS_IO_PROG="`set_prog_path xfs_io`"
export XFS_PARALLEL_REPAIR_PROG="`set_prog_path xfs_prepair`" export XFS_PARALLEL_REPAIR_PROG="`set_prog_path xfs_prepair`"
export XFS_PARALLEL_REPAIR64_PROG="`set_prog_path xfs_prepair64`" export XFS_PARALLEL_REPAIR64_PROG="`set_prog_path xfs_prepair64`"
export __XFSDUMP_PROG="`set_prog_path xfsdump`" export __XFSDUMP_PROG="`set_prog_path xfsdump`"
export XFSDUMP_PROG="$__XFSDUMP_PROG -e" if [ -n "$__XFSDUMP_PROG" ]; then
export XFSDUMP_PROG="$__XFSDUMP_PROG -e"
else
export XFSDUMP_PROG=""
fi
export XFSRESTORE_PROG="`set_prog_path xfsrestore`" export XFSRESTORE_PROG="`set_prog_path xfsrestore`"
export XFSINVUTIL_PROG="`set_prog_path xfsinvutil`" export XFSINVUTIL_PROG="`set_prog_path xfsinvutil`"
export GETFATTR_PROG="`set_prog_path getfattr`" export GETFATTR_PROG="`set_prog_path getfattr`"
tests/xfs/195
+4 -3
View File
@@ -48,11 +48,11 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
# #
_do_dump() _do_dump()
{ {
xfsdump -l 0 -s d -F \ $XFSDUMP_PROG -l 0 -s d -F \
-L prova -M prova \ -L prova -M prova \
-f $TEST_DIR/dumpfile -e -v excluded_files=debug $TEST_DIR \ -f $TEST_DIR/dumpfile -v excluded_files=debug $TEST_DIR \
| grep "ino $inum" \ | grep "ino $inum" \
| sed -e 's/xfsdump: pruned ino [0-9]*, owner 0, estimated size 0: skip flag set/xfsdump: pruned ino NNN, owner 0, estimated size 0: skip flag set/' | sed -e 's/.*xfsdump: pruned ino [0-9]*, owner 0, estimated size 0: skip flag set/xfsdump: pruned ino NNN, owner 0, estimated size 0: skip flag set/'
} }
# get standard environment, filters and checks # get standard environment, filters and checks
@@ -65,6 +65,7 @@ _supported_os Linux
_require_test _require_test
_require_user _require_user
_require_command $XFSDUMP_PROG xfsdump
echo "Preparing subtree" echo "Preparing subtree"
mkdir $TEST_DIR/d mkdir $TEST_DIR/d