]> git.apps.os.sepia.ceph.com Git - xfstests-dev.git/commit
xfstests: don't remove the two first devices from SCRATCH_DEV_POOL
authorStefan Behrens <sbehrens@giantdisaster.de>
Fri, 23 Aug 2013 13:07:10 +0000 (13:07 +0000)
committerRich Johnston <rjohnston@sgi.com>
Wed, 28 Aug 2013 13:33:21 +0000 (08:33 -0500)
commitf1dce456c594a784afb723d1bc7c09056ab3d9d9
tree168ff46907194453caea24791f7b000f1ae75d99
parent385f466a3d872b40379842b7709cf4a3823deabc
xfstests: don't remove the two first devices from SCRATCH_DEV_POOL

Since common/config is executed twice, if SCRATCH_DEV_POOL is configured
via the environment, the current code removes the first device entry twice
which means that you lose the second device for the test.

The fix is to not remove anything from SCRATCH_DEV_POOL anymore.
That used to be done (I can only guess) to allow to pass the
SCRATCH_DEV_POOL as an argument to _scratch_mkfs. Since _scratch_mkfs adds
the SCRATCH_DEV, the pool mustn't contain that device anymore.

A new function _scratch_pool_mkfs is introduced that does the expected
thing.

Signed-off-by: Stefan Behrens <sbehrens@giantdisaster.de>
Reviewed-by: Josef Bacik <jbacik@fusionio.com>
Signed-off-by: Rich Johnston <rjohnston@sgi.com>
common/config
common/rc
tests/btrfs/002
tests/btrfs/003
tests/btrfs/006