xfs
[Top] [All Lists]

[PATCH] xfstests: Don't require to set $TEST_DEV and $TEST_DIR when crea

To: xfs@xxxxxxxxxxx
Subject: [PATCH] xfstests: Don't require to set $TEST_DEV and $TEST_DIR when creating new script
From: Tomas Racek <tracek@xxxxxxxxxx>
Date: Mon, 30 Jul 2012 14:03:31 +0200
Cc: lczerner@xxxxxxxxxx, Tomas Racek <tracek@xxxxxxxxxx>
Signed-off-by: Tomas Racek <tracek@xxxxxxxxxx>
---
 common.config |   26 ++++++++++++++------------
 1 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/common.config b/common.config
index 7bed1c5..b92c025 100644
--- a/common.config
+++ b/common.config
@@ -201,9 +201,9 @@ known_hosts()

   #  Mandatory Config values.
   MC=""
-  [ -z "$EMAIL" ]          && MC="$MC EMAIL"
-  [ -z "$TEST_DIR" ]       && MC="$MC TEST_DIR"
-  [ -z "$TEST_DEV" ]       && MC="$MC TEST_DEV"
+  [ -z "$EMAIL" ]                           && MC="$MC EMAIL"
+  [ -z "$TEST_DIR" ] && [ "$iam" != "new" ] && MC="$MC TEST_DIR"
+  [ -z "$TEST_DEV" ] && [ "$iam" != "new" ] && MC="$MC TEST_DEV"

   if [ -n "$MC" ]; then
     echo "Warning: need to define parameters for host $HOST"
@@ -219,15 +219,17 @@ else
     known_hosts
 fi

-echo $TEST_DEV | grep -q ":" > /dev/null 2>&1
-if [ ! -b "$TEST_DEV" -a "$?" != "0" ]; then
-    echo "common.config: Error: \$TEST_DEV ($TEST_DEV) is not a block device 
or a NFS filesystem"
-    exit 1
-fi
-
-if [ ! -d "$TEST_DIR" ]; then
-    echo "common.config: Error: \$TEST_DIR ($TEST_DIR) is not a directory"
-    exit 1
+if [ "$iam" != "new" ]; then
+       echo $TEST_DEV | grep -q ":" > /dev/null 2>&1
+       if [ ! -b "$TEST_DEV" -a "$?" != "0" ]; then
+           echo "common.config: Error: \$TEST_DEV ($TEST_DEV) is not a block 
device or a NFS filesystem"
+           exit 1
+       fi
+
+       if [ ! -d "$TEST_DIR" ]; then
+           echo "common.config: Error: \$TEST_DIR ($TEST_DIR) is not a 
directory"
+           exit 1
+       fi
 fi

 # a btrfs tester will set only SCRATCH_DEV_POOL, we will put first of its dev
--
1.7.7.6

<Prev in Thread] Current Thread [Next in Thread>