mirror of
https://github.com/linux-apfs/apfstests.git
synced 2026-05-01 15:01:44 -07:00
overlay: rename OVERLAY_LOWER/UPPER/WORK_DIR
As preparation step for configuring test/scratch base fs for overlay tests: - Rename OVERLAY_LOWER/UPPER/WORK_DIR => OVL_LOWER/UPPER/WORK because we want to use OVL_ prefix for all base fs vars - Prepend "ovl-" prefix to lower/upper/work path values to isolate the overlay test dirs when running on a base fs that is also used to run non overlay tests - Make those vars values non-configurable, because lower/upper/work directory names are an internal test detail which should not concern the user and because we wish to simplify and document the overlay tests setup - Add helper _filter_ovl_dirs and use it to filter output of test overlay/023 which matches the constant string "work" Signed-off-by: Amir Goldstein <amir73il@gmail.com> Reviewed-by: Eryu Guan <eguan@redhat.com> Signed-off-by: Eryu Guan <eguan@redhat.com>
This commit is contained in:
committed by
Eryu Guan
parent
7626c85341
commit
6f5ba68b7b
+4
-4
@@ -55,10 +55,10 @@ _scratch_mkfs
|
||||
|
||||
# Need two lower dirs in this test, and we mount overlay ourselves,
|
||||
# create upper and workdir as well
|
||||
lowerdir1=$SCRATCH_DEV/$OVERLAY_LOWER_DIR.1
|
||||
lowerdir2=$SCRATCH_DEV/$OVERLAY_LOWER_DIR.2
|
||||
upperdir=$SCRATCH_DEV/$OVERLAY_UPPER_DIR
|
||||
workdir=$SCRATCH_DEV/$OVERLAY_WORK_DIR
|
||||
lowerdir1=$SCRATCH_DEV/$OVL_LOWER.1
|
||||
lowerdir2=$SCRATCH_DEV/$OVL_LOWER.2
|
||||
upperdir=$SCRATCH_DEV/$OVL_UPPER
|
||||
workdir=$SCRATCH_DEV/$OVL_WORK
|
||||
mkdir -p $lowerdir1 $lowerdir2 $upperdir $workdir
|
||||
|
||||
# One lowerdir contains test dir and test files, the other contains whiteout
|
||||
|
||||
Reference in New Issue
Block a user