test-appliance: use new overlay xfstest config

Commit Message

Amir Goldstein May 19, 2017, 6:51 a.m. UTC

requires xfstests commit 33e4199
("overlay: use OVL_BASE_SCRATCH_MNT instead of SCRATCH_DEV")

Signed-off-by: Amir Goldstein <[e-mail]>
---
 kvm-xfstests/test-appliance/files/root/fs/overlay/cfg/large | 8 ++++----
 kvm-xfstests/test-appliance/files/root/fs/overlay/cfg/small | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

Ted,

Forgot to post this one in addition to the github PR:
https://github.com/tytso/xfstests-bld/pull/4

Using the new overlay xfstest config is helping catch reference leak
bugs all the time, because it mount cycle the underlying base fs on
every test and within tests that do cycle_mount.

Please pull.

Thanks,
Amir.

Patch

diff --git a/kvm-xfstests/test-appliance/files/root/fs/overlay/cfg/large b/kvm-xfstests/test-appliance/files/root/fs/overlay/cfg/large
index ec1adf0..ab9a2bb 100644
--- a/kvm-xfstests/test-appliance/files/root/fs/overlay/cfg/large
+++ b/kvm-xfstests/test-appliance/files/root/fs/overlay/cfg/large
@@ -9,10 +9,10 @@  function format_filesystem()
 }
 
 SIZE=large
-export TEST_DEV=$LG_TST_MNT/ovl
-export TEST_DIR=$LG_TST_MNT/testarea
-export SCRATCH_DEV=$LG_SCR_MNT/ovl
-export SCRATCH_MNT=$LG_SCR_MNT/testarea
+export TEST_DEV=$LG_TST_DEV
+export TEST_DIR=$LG_TST_MNT
+export SCRATCH_DEV=$LG_SCR_DEV
+export SCRATCH_MNT=$LG_SCR_MNT
 export EXT_MOUNT_OPTIONS=""
 TESTNAME="overlayfs large"
 mkdir -p /test/tmp /test/scratch
diff --git a/kvm-xfstests/test-appliance/files/root/fs/overlay/cfg/small b/kvm-xfstests/test-appliance/files/root/fs/overlay/cfg/small
index a28a191..552e302 100644
--- a/kvm-xfstests/test-appliance/files/root/fs/overlay/cfg/small
+++ b/kvm-xfstests/test-appliance/files/root/fs/overlay/cfg/small
@@ -9,10 +9,10 @@  function format_filesystem()
 }
 
 SIZE=small
-export TEST_DEV=$SM_TST_MNT/ovl
-export TEST_DIR=$SM_TST_MNT/testarea
-export SCRATCH_DEV=$SM_SCR_MNT/ovl
-export SCRATCH_MNT=$SM_SCR_MNT/testarea
+export TEST_DEV=$SM_TST_DEV
+export TEST_DIR=$SM_TST_MNT
+export SCRATCH_DEV=$SM_SCR_DEV
+export SCRATCH_MNT=$SM_SCR_MNT
 export EXT_MOUNT_OPTIONS=""
 TESTNAME="overlayfs small"
 mkdir -p /test/tmp /test/scratch