|
 |
26e710 |
test/lib/aux.sh | 14 +++++++-------
|
|
|
26e710 |
1 file changed, 7 insertions(+), 7 deletions(-)
|
|
|
26e710 |
|
|
|
26e710 |
diff --git a/test/lib/aux.sh b/test/lib/aux.sh
|
|
|
26e710 |
index e3f624c..81e8f91 100644
|
|
|
26e710 |
--- a/test/lib/aux.sh
|
|
|
26e710 |
+++ b/test/lib/aux.sh
|
|
|
26e710 |
@@ -26,7 +26,7 @@ expect_failure() {
|
|
|
26e710 |
check_daemon_in_builddir() {
|
|
|
26e710 |
# skip if we don't have our own deamon...
|
|
|
26e710 |
if test -z "${installed_testsuite+varset}"; then
|
|
|
26e710 |
- (which "$1" 2>/dev/null | grep -q "$abs_builddir") || skip "$1 is not in executed path."
|
|
|
26e710 |
+ (which "$1" 2>/dev/null | grep "$abs_builddir" >/dev/null ) || skip "$1 is not in executed path."
|
|
|
26e710 |
fi
|
|
|
26e710 |
rm -f debug.log strace.log
|
|
|
26e710 |
}
|
|
|
26e710 |
@@ -167,7 +167,7 @@ prepare_clvmd() {
|
|
|
26e710 |
|
|
|
26e710 |
test -e "$DM_DEV_DIR/control" || dmsetup table >/dev/null # create control node
|
|
|
26e710 |
# skip if singlenode is not compiled in
|
|
|
26e710 |
- (clvmd --help 2>&1 | grep "Available cluster managers" | grep -q "singlenode") || \
|
|
|
26e710 |
+ (clvmd --help 2>&1 | grep "Available cluster managers" | grep "singlenode" >/dev/null) || \
|
|
|
26e710 |
skip "Compiled clvmd does not support singlenode for testing."
|
|
|
26e710 |
|
|
|
26e710 |
# lvmconf "activation/monitoring = 1"
|
|
|
26e710 |
@@ -531,7 +531,7 @@ teardown() {
|
|
|
26e710 |
dm_table | not grep -E -q "$vg|$vg1|$vg2|$vg3|$vg4" || {
|
|
|
26e710 |
# Avoid activation of dmeventd if there is no pid
|
|
|
26e710 |
cfg=$(test -s LOCAL_DMEVENTD || echo "--config activation{monitoring=0}")
|
|
|
26e710 |
- if dm_info suspended,name | grep -q "^Suspended:.*$PREFIX" ; then
|
|
|
26e710 |
+ if dm_info suspended,name | grep "^Suspended:.*$PREFIX" >/dev/null ; then
|
|
|
26e710 |
echo "## skipping vgremove, suspended devices detected."
|
|
|
26e710 |
else
|
|
|
26e710 |
vgremove -ff "$cfg" \
|
|
|
26e710 |
@@ -662,7 +662,7 @@ prepare_scsi_debug_dev() {
|
|
|
26e710 |
|
|
|
26e710 |
# Skip test if scsi_debug module is unavailable or is already in use
|
|
|
26e710 |
modprobe --dry-run scsi_debug || skip
|
|
|
26e710 |
- lsmod | not grep -q scsi_debug || skip
|
|
|
26e710 |
+ lsmod | not grep scsi_debug >/dev/null || skip
|
|
|
26e710 |
|
|
|
26e710 |
# Create the scsi_debug device and determine the new scsi device's name
|
|
|
26e710 |
# NOTE: it will _never_ make sense to pass num_tgts param;
|
|
|
26e710 |
@@ -1447,7 +1447,7 @@ driver_at_least() {
|
|
|
26e710 |
}
|
|
|
26e710 |
|
|
|
26e710 |
have_thin() {
|
|
|
26e710 |
- lvm segtypes 2>/dev/null | grep -q thin$ || {
|
|
|
26e710 |
+ lvm segtypes 2>/dev/null | grep thin$ >/dev/null || {
|
|
|
26e710 |
echo "Thin is not built-in." >&2
|
|
|
26e710 |
return 1
|
|
|
26e710 |
}
|
|
|
26e710 |
@@ -1471,7 +1471,7 @@ have_thin() {
|
|
|
26e710 |
}
|
|
|
26e710 |
|
|
|
26e710 |
have_vdo() {
|
|
|
26e710 |
- lvm segtypes 2>/dev/null | grep -q vdo$ || {
|
|
|
26e710 |
+ lvm segtypes 2>/dev/null | grep vdo$ >/dev/null || {
|
|
|
26e710 |
echo "VDO is not built-in." >&2
|
|
|
26e710 |
return 1
|
|
|
26e710 |
}
|
|
|
26e710 |
@@ -1507,7 +1507,7 @@ have_raid4 () {
|
|
|
26e710 |
}
|
|
|
26e710 |
|
|
|
26e710 |
have_cache() {
|
|
|
26e710 |
- lvm segtypes 2>/dev/null | grep -q cache$ || {
|
|
|
26e710 |
+ lvm segtypes 2>/dev/null | grep cache$ >/dev/null || {
|
|
|
26e710 |
echo "Cache is not built-in." >&2
|
|
|
26e710 |
return 1
|
|
|
26e710 |
}
|