diff options
Diffstat (limited to 'tests/features')
-rw-r--r-- | tests/features/fdl-overflow.t | 6 | ||||
-rw-r--r-- | tests/features/fdl.t | 12 | ||||
-rw-r--r-- | tests/features/recon.t | 8 |
3 files changed, 3 insertions, 23 deletions
diff --git a/tests/features/fdl-overflow.t b/tests/features/fdl-overflow.t index d7633a7ca7d..fd4bb951c5a 100644 --- a/tests/features/fdl-overflow.t +++ b/tests/features/fdl-overflow.t @@ -2,11 +2,7 @@ . $(dirname $0)/../include.rc . $(dirname $0)/../volume.rc - -log_base=$($CLI --print-logdir) -log_id=${B0}/${V0}-0 -log_id=${log_id:1} # Remove initial slash -log_id=${log_id//\//-} # Replace remaining slashes with dashes +. $(dirname $0)/../fdl.rc _check_sizes () { local n=0 diff --git a/tests/features/fdl.t b/tests/features/fdl.t index 34d6d78228a..28097a1536a 100644 --- a/tests/features/fdl.t +++ b/tests/features/fdl.t @@ -2,17 +2,7 @@ . $(dirname $0)/../include.rc . $(dirname $0)/../volume.rc - -log_base=$($CLI --print-logdir) -log_id=${B0}/${V0}-0 -log_id=${log_id:1} # Remove initial slash -log_id=${log_id//\//-} # Replace remaining slashes with dashes -FDL_META_FILE=${log_base}/${log_id}-meta-1.jnl -FDL_DATA_FILE=${log_base}/${log_id}-data-1.jnl - -check_logfile() { - [ $(gf_logdump $FDL_META_FILE $FDL_DATA_FILE | grep $1 | wc -l) -ge $2 ] -} +. $(dirname $0)/../fdl.rc if [ x"$OSTYPE" = x"NetBSD" ]; then CREAT_OFLAG="creat," diff --git a/tests/features/recon.t b/tests/features/recon.t index 9989f243380..4fdae3bdd0d 100644 --- a/tests/features/recon.t +++ b/tests/features/recon.t @@ -3,13 +3,7 @@ . $(dirname $0)/../traps.rc . $(dirname $0)/../include.rc . $(dirname $0)/../volume.rc - -log_base=$($CLI --print-logdir) -log_id=${B0}/${V0}-0 -log_id=${log_id:1} # Remove initial slash -log_id=${log_id//\//-} # Replace remaining slashes with dashes -FDL_META_FILE=${log_base}/${log_id}-meta-1.jnl -FDL_DATA_FILE=${log_base}/${log_id}-data-1.jnl +. $(dirname $0)/../fdl.rc tmpdir=$(mktemp -d -t ${0##*/}.XXXXXX) push_trapfunc "rm -rf $tmpdir" |