From 7768bf69fe84345d5c1d68b54b8405a83227af89 Mon Sep 17 00:00:00 2001 From: Bill Kendall Date: Tue, 1 Nov 2011 14:53:05 -0500 Subject: [PATCH] xfstests: refactor xfsdump quota checking Tests can enable/disable quota checking by passing -q or -Q to the various dump and restore helper routines. But -q and -Q are valid xfsdump/xfsrestore options, so in addition to being confusing, tests cannot use these options. Use --check-quota and --no-check-quota instead. Signed-off-by: Bill Kendall Signed-off-by: Christoph Hellwig --- 061 | 3 ++- common.dump | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/061 b/061 index 414675fa..2b08e11c 100755 --- a/061 +++ b/061 @@ -48,7 +48,8 @@ dump_file=src/dumpfile # override dump_file to checked-in dumpfile session_label="stress_056" # we have no quotas to restore # if we happen to run this on crackle then put the hostname back -_do_restore_file -Q | sed -e 's/HOSTNAME/crackle/g' -e 's#SCRATCH_DEV#/dev/dsk/dks0d2s1#' +_do_restore_file --no-check-quota | +sed -e 's/HOSTNAME/crackle/g' -e 's#SCRATCH_DEV#/dev/dsk/dks0d2s1#' _diff_compare_sub _ls_nodate_compare_sub diff --git a/common.dump b/common.dump index 56b348aa..09f1a918 100644 --- a/common.dump +++ b/common.dump @@ -903,10 +903,10 @@ _parse_args() multi=$2 shift ;; - -q) + --check-quota) do_quota_check=true ;; - -Q) + --no-check-quota) do_quota_check=false ;; -l|-d) -- 2.39.5