From: Zhao Lei <[email protected]> _is_block_dev() will show above warning when "$dev" is not exist. It happened when the program check $TEST_DEV with blank $SCRATCH_DEV which is optional.
Changelog v3->v4: Fix problem by adding quotes to _is_block_dev()'s argument. Suggested by: Lukáš Czerner <[email protected]> Changelog v2->v3: Separate __same_block_dev() from _is_block_dev() to make code self documenting. Suggested by: Dave Chinner <[email protected]> Changelog v1->v2: Rewrite _is_block_dev() to make caller code simple. Suggested by: Dave Chinner <[email protected]> Suggested-by: Lukáš Czerner <[email protected]> Suggested-by: Dave Chinner <[email protected]> Signed-off-by: Zhao Lei <[email protected]> --- common/rc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/common/rc b/common/rc index 23193c8..7ae0933 100644 --- a/common/rc +++ b/common/rc @@ -1095,11 +1095,11 @@ _require_scratch_nocheck() fi ;; *) - if [ -z "$SCRATCH_DEV" -o "`_is_block_dev $SCRATCH_DEV`" = "" ] + if [ -z "$SCRATCH_DEV" -o "`_is_block_dev "$SCRATCH_DEV"`" = "" ] then _notrun "this test requires a valid \$SCRATCH_DEV" fi - if [ "`_is_block_dev $SCRATCH_DEV`" = "`_is_block_dev $TEST_DEV`" ] + if [ "`_is_block_dev "$SCRATCH_DEV"`" = "`_is_block_dev "$TEST_DEV"/`" ] then _notrun "this test requires a valid \$SCRATCH_DEV" fi @@ -1167,11 +1167,11 @@ _require_test() fi ;; *) - if [ -z "$TEST_DEV" -o "`_is_block_dev $TEST_DEV`" = "" ] + if [ -z "$TEST_DEV" -o "`_is_block_dev "$TEST_DEV"`" = "" ] then _notrun "this test requires a valid \$TEST_DEV" fi - if [ "`_is_block_dev $SCRATCH_DEV`" = "`_is_block_dev $TEST_DEV`" ] + if [ "`_is_block_dev "$SCRATCH_DEV"`" = "`_is_block_dev "$TEST_DEV"`" ] then _notrun "this test requires a valid \$TEST_DEV" fi @@ -2236,10 +2236,10 @@ _require_scratch_dev_pool() esac for i in $SCRATCH_DEV_POOL; do - if [ "`_is_block_dev $i`" = "" ]; then + if [ "`_is_block_dev "$i"`" = "" ]; then _notrun "this test requires valid block disk $i" fi - if [ "`_is_block_dev $i`" = "`_is_block_dev $TEST_DEV`" ]; then + if [ "`_is_block_dev "$i"`" = "`_is_block_dev "$TEST_DEV"`" ]; then _notrun "$i is part of TEST_DEV, this test requires unique disks" fi if _mount | grep -q $i; then -- 1.8.5.1 -- To unsubscribe from this list: send the line "unsubscribe fstests" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
