summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZdenek Kabelac <zkabelac@redhat.com>2014-02-28 23:05:58 +0100
committerZdenek Kabelac <zkabelac@redhat.com>2014-03-01 14:08:59 +0100
commit72ecf8e591d1ee6b863d814114a7a8045598efc0 (patch)
treebb12a396234c5e673011f18452dbabb40ece727f
parent090e81281fbf88bf27ee6930dfaf03cd48aade88 (diff)
downloadlvm2-72ecf8e591d1ee6b863d814114a7a8045598efc0.tar.gz
tests: detect reiserfs support
Since reiserfs is not commonly available detect its presence in kernel. Stop reporting skipped test as WARNING.
-rw-r--r--test/shell/fsadm.sh7
1 files changed, 5 insertions, 2 deletions
diff --git a/test/shell/fsadm.sh b/test/shell/fsadm.sh
index 13e5304e0..04b659f2c 100644
--- a/test/shell/fsadm.sh
+++ b/test/shell/fsadm.sh
@@ -29,8 +29,11 @@ which mkfs.xfs || check_xfs=${check_xfs:-mkfs.xfs}
which xfs_check || {
which xfs_repair || check_xfs=${check_xfs:-xfs_repair}
}
+grep xfs /proc/filesystems || check_xfs=${check_xfs:-no_xfs}
+
which mkfs.reiserfs || check_reiserfs=${check_reiserfs:-mkfs.reiserfs}
which reiserfsck || check_reiserfs=${check_reiserfs:-reiserfsck}
+grep reiserfs /proc/filesystems || check_reiserfs=${check_reiserfs:-no_reiserfs}
vg_lv=$vg/$lv1
vg_lv2=$vg/${lv1}bar
@@ -75,9 +78,9 @@ check_missing()
eval local t=$\check_$1
test -z "$t" && return 0
test "$t" = skip && return 1
- # trick to get test listed with warning
echo "WARNING: fsadm test skipped $1 tests, $t tool is missing."
- should false;
+ # trick to get test listed with warning
+ # should false;
return 1
}