changes for regression framework and functions for mounting

3 files changed, 10 insertions, 46 deletions

diff --git a/dvm/2010/testcase b/dvm/2010/testcase
index bdd4589..cdc3055 100755
--- a/dvm/2010/testcase
+++ b/dvm/2010/testcase
@@ -1,25 +1,13 @@
 #!/bin/bash
 
 source ./regression_helpers
-source ./init
 
-GLUSTERD_DIR=$(dirname $GLUSTERD);
+VOLNAME="vol";
+$GLUSTERFSDIR/gluster volume create $VOLNAME $(hostname):$EXPORT_DIR/$global_bug_id/export1 2>/dev/null 1>/dev/null;
 
-mkdir $EXPORT_DIR/$global_bug_id/;
+$GLUSTERFSDIR/gluster --mode=script volume stop $VOLNAME | grep "started state" 2>/dev/null 1>/dev/null;
 
-$GLUSTERD_DIR/gluster volume create vol $(hostname):$EXPORT_DIR/$global_bug_id/export1 2>/dev/null 1>/dev/null;
+exit $?;
 
-$GLUSTERD_DIR/gluster --mode=script volume stop vol | grep "started state" 2>/dev/null 1>/dev/null;
 
-if [ $? -ne 0 ]; then
-    echo -n "$global_bug_id: "
-    not_ok;
-else
-    echo -n "$global_bug_id: "
-    ok;
-fi
-
-test_kill;
-
-test_cleanup;
 
diff --git a/dvm/2140/testcase b/dvm/2140/testcase
index be0b980..cc7ec09 100755
--- a/dvm/2140/testcase
+++ b/dvm/2140/testcase
@@ -1,20 +1,9 @@
 #!/bin/bash
 
-source ./init
 source ./regression_helpers
 
-GLUSTERD_DIR=$(dirname $GLUSTERD);
-mkdir $EXPORT_DIR/$global_bug_id/;
+VOLNAME="abcdefg";
+$GLUSTERFSDIR/gluster volume delete $VOLNAME --mode=script | grep -i "exist" 2>/dev/null 1>/dev/null
+exit $?;
 
-$GLUSTERD_DIR/gluster volume delete abcdsdrgf --mode=script | grep -i "exist" 2>/dev/null 1>/dev/null
-if [ $? -ne 0 ]; then
-    echo -n "$global_bug_id: "
-    not_ok;
-else
-    echo -n "$global_bug_id: "
-    ok;
-fi
 
-test_kill;
-
-test_cleanup;
diff --git a/dvm/2294/testcase b/dvm/2294/testcase
index 58eeae0..c363897 100755
--- a/dvm/2294/testcase
+++ b/dvm/2294/testcase
@@ -1,22 +1,9 @@
 #!/bin/bash
 
-
-source ./init
 source ./regression_helpers
 
-GLUSTERD_DIR=$(dirname $GLUSTERD);
-mkdir $EXPORT_DIR/$global_bug_id/;
-
-$GLUSTERD_DIR/gluster volume create vol transport tcp,rdma $(hostname):$EXPORT_DIR/$global_bug_id/export1 2>/dev/null 1>/dev/null
-
-if [ $? -ne 0 ]; then
-    echo -n "$global_bug_id: "
-    not_ok;
-else
-    echo -n "$global_bug_id: "
-    ok;
-fi
+VOLNAME="vol";
+$GLUSTERFSDIR/gluster volume create $VOLNAME transport tcp,rdma $(hostname):$EXPORT_DIR/$global_bug_id/export1 2>/dev/null 1>/dev/null
+exit $?;
 
-test_kill;
 
-test_cleanup;