mirror of
https://github.com/linux-apfs/apfstests.git
synced 2026-05-01 15:01:44 -07:00
fix common.config to allow SCRATCH_DEV and SCRATCH_MNT to be optional
Commit 3ae9f2f8 purports to allow SCRATCH_DEV and SCRATCH_MNT to be
optional, but tests in common.config will cause check to exit with an
error if these environment variables are not defined. Fix this problem.
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Signed-off-by: Christoph Hellwig <hch@lst.de>
This commit is contained in:
committed by
Christoph Hellwig
parent
74dee07d4a
commit
83f15ee79b
+4
-5
@@ -23,10 +23,10 @@
|
||||
# mounted XFS file system, needs to be be world
|
||||
# writeable
|
||||
# TEST_DEV - device for file system containing TEST_DIR
|
||||
# SCRATCH_DEV - device you can make a scratch file system on
|
||||
# SCRATCH_MNT - mount point for scratch file system
|
||||
#
|
||||
# and optionally:
|
||||
# SCRATCH_DEV - device you can make a scratch file system on
|
||||
# SCRATCH_MNT - mount point for scratch file system
|
||||
# SCRATCH_LOGDEV - scratch log device for external log testing
|
||||
# SCRATCH_RTDEV - scratch rt dev
|
||||
# TEST_LOGDEV - test log device for external log testing
|
||||
@@ -197,14 +197,13 @@ known_hosts()
|
||||
# [ -z "$TEST_LOGDEV" ] && MC="$MC TEST_LOGDEV"
|
||||
# [ -z "$SCRATCH_LOGDEV" ] && MC="$MC SCRATCH_LOGDEV"
|
||||
# [ -z "$SCRATCH_RTDEV" ] && MC="$MC SCRATCH_RTDEV"
|
||||
# [ -z "$SCRATCH_MNT" ] && MC="$MC SCRATCH_MNT"
|
||||
# [ -z "$SCRATCH_DEV" ] && MC="$MC SCRATCH_DEV"
|
||||
|
||||
[ -z "$EMAIL" ] && MC="$MC EMAIL"
|
||||
[ -z "$TEST_DIR" ] && MC="$MC TEST_DIR"
|
||||
[ -z "$TEST_DEV" ] && MC="$MC TEST_DEV"
|
||||
|
||||
[ -z "$SCRATCH_MNT" ] && MC="$MC SCRATCH_MNT"
|
||||
[ -z "$SCRATCH_DEV" ] && MC="$MC SCRATCH_DEV"
|
||||
|
||||
[ "$MC" ] && (echo "Warning: need to define parameters for host $HOST";\
|
||||
echo " or set variables:"; \
|
||||
echo " $MC")
|
||||
|
||||
Reference in New Issue
Block a user