summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xdvm/2010/testcase2
-rwxr-xr-xdvm/2033/testcase2
-rwxr-xr-xdvm/2099/testcase2
-rwxr-xr-xdvm/2140/testcase2
-rwxr-xr-xdvm/2145/testcase2
-rwxr-xr-xdvm/2154/testcase2
-rwxr-xr-xdvm/2294/testcase2
-rwxr-xr-xdvm/2369/testcase2
-rwxr-xr-xdvm/2426/testcase2
-rwxr-xr-xdvm/2483/testcase2
-rwxr-xr-xdvm/2501/testcase2
-rwxr-xr-xdvm/2623/testcase2
-rwxr-xr-xdvm/2742/testcase2
-rw-r--r--regression_helpers9
-rwxr-xr-xrun.sh5
15 files changed, 18 insertions, 22 deletions
diff --git a/dvm/2010/testcase b/dvm/2010/testcase
index e3052b7..d14f338 100755
--- a/dvm/2010/testcase
+++ b/dvm/2010/testcase
@@ -1,6 +1,6 @@
#!/bin/bash
-source $cw$cwd/regression_helpers
+source ./regression_helpers
$GLUSTERFSDIR/gluster volume create $global_bug_id $(hostname):$EXPORT_DIR/$global_bug_id/export1 2>/dev/null 1>/dev/null;
diff --git a/dvm/2033/testcase b/dvm/2033/testcase
index a888928..03d0879 100755
--- a/dvm/2033/testcase
+++ b/dvm/2033/testcase
@@ -1,6 +1,6 @@
#!/bin/bash
-source $cwd/regression_helpers
+source ./regression_helpers
$GLUSTERFSDIR/gluster volume create $global_bug_id $(hostname):$EXPORT_DIR/$global_bug_id/export1 2>/dev/null 1>/dev/null;
diff --git a/dvm/2099/testcase b/dvm/2099/testcase
index 08c84e4..c7f5d82 100755
--- a/dvm/2099/testcase
+++ b/dvm/2099/testcase
@@ -1,6 +1,6 @@
#!/bin/bash
-source $cwd/regression_helpers
+source ./regression_helpers
VOLNAME="volley"
diff --git a/dvm/2140/testcase b/dvm/2140/testcase
index 28deb0c..34b7d5e 100755
--- a/dvm/2140/testcase
+++ b/dvm/2140/testcase
@@ -1,6 +1,6 @@
#!/bin/bash
-source $cwd/regression_helpers
+source ./regression_helpers
$GLUSTERFSDIR/gluster volume delete $global_bug_id --mode=script | grep -i "exist" 2>/dev/null 1>/dev/null
exit $?;
diff --git a/dvm/2145/testcase b/dvm/2145/testcase
index 969c522..afeee55 100755
--- a/dvm/2145/testcase
+++ b/dvm/2145/testcase
@@ -1,6 +1,6 @@
#!/bin/bash
-source $cwd/regression_helpers
+source ./regression_helpers
VOLNAME="vol$global_bug_id";
diff --git a/dvm/2154/testcase b/dvm/2154/testcase
index a3f8730..50b58c0 100755
--- a/dvm/2154/testcase
+++ b/dvm/2154/testcase
@@ -1,6 +1,6 @@
#!/bin/bash
-source $cwd/regression_helpers
+source ./regression_helpers
$GLUSTERFSDIR/gluster volume create $global_bug_id $(hostname):$EXPORT_DIR/$global_bug_id/export1 2>/dev/null 1>/dev/null
diff --git a/dvm/2294/testcase b/dvm/2294/testcase
index 2f984cf..b0d8674 100755
--- a/dvm/2294/testcase
+++ b/dvm/2294/testcase
@@ -1,6 +1,6 @@
#!/bin/bash
-source $cwd/regression_helpers
+source ./regression_helpers
$GLUSTERFSDIR/gluster volume create $global_bug_id transport tcp,rdma $(hostname):$EXPORT_DIR/$global_bug_id/export1 2>/dev/null 1>/dev/null
exit $?;
diff --git a/dvm/2369/testcase b/dvm/2369/testcase
index 2ad2557..f25af14 100755
--- a/dvm/2369/testcase
+++ b/dvm/2369/testcase
@@ -1,6 +1,6 @@
#!/bin/bash
-source $cwd/regression_helpers
+source ./regression_helpers
$GLUSTERFSDIR/gluster volume create $global_bug_id $(hostname):$EXPORT_DIR/$global_bug_id/export1 2>/dev/null 1>/dev/null;
diff --git a/dvm/2426/testcase b/dvm/2426/testcase
index 1c9e750..4c5dda9 100755
--- a/dvm/2426/testcase
+++ b/dvm/2426/testcase
@@ -1,6 +1,6 @@
#!/bin/bash
-source $cwd/regression_helpers
+source ./regression_helpers
$GLUSTERFSDIR/gluster volume create $global_bug_id $(hostname):$EXPORT_DIR/$global_bug_id/brick1 $(hostname):$EXPORT_DIR/$global_bug_id/brick2 2>/dev/null 1>/dev/null
diff --git a/dvm/2483/testcase b/dvm/2483/testcase
index a0a85d2..ba62402 100755
--- a/dvm/2483/testcase
+++ b/dvm/2483/testcase
@@ -1,6 +1,6 @@
#!/bin/bash
-source $cwd/regression_helpers
+source ./regression_helpers
VOLNAME="vol$global_bug_id"
diff --git a/dvm/2501/testcase b/dvm/2501/testcase
index 4702b00..63561c5 100755
--- a/dvm/2501/testcase
+++ b/dvm/2501/testcase
@@ -1,6 +1,6 @@
#!/bin/bash
-source $cwd/regression_helpers
+source ./regression_helpers
VOLNAME="vol$global_bug_id";
diff --git a/dvm/2623/testcase b/dvm/2623/testcase
index b90c3eb..48b209a 100755
--- a/dvm/2623/testcase
+++ b/dvm/2623/testcase
@@ -1,6 +1,6 @@
#!/bin/bash
-source $cwd/regression_helpers
+source ./regression_helpers
$GLUSTERFSDIR/gluster volume create $global_bug_id $(hostname):$EXPORT_DIR/$global_bug_id/export1 2>/dev/null 1>/dev/null;
diff --git a/dvm/2742/testcase b/dvm/2742/testcase
index 800924e..062c144 100755
--- a/dvm/2742/testcase
+++ b/dvm/2742/testcase
@@ -1,6 +1,6 @@
#!/bin/bash
-source $cwd/regression_helpers
+source ./regression_helpers
VOLNAME="vol$global_bug_id";
diff --git a/regression_helpers b/regression_helpers
index b373d1b..cf0e343 100644
--- a/regression_helpers
+++ b/regression_helpers
@@ -106,11 +106,11 @@ run_testcase ()
export FUSE_MOUNT=$EXPORT_DIR/$global_bug_id/fuse;
export NFS_MOUNT=$EXPORT_DIR/$global_bug_id/nfs;
- if [ -f $cwd/dvm/$id/testcase ]; then
+ if [ -f ./dvm/$id/testcase ]; then
create_directory $FUSE_MOUNT;
create_directory $NFS_MOUNT;
- $cwd/dvm/$id/testcase $GLUSTERD;
+ ./dvm/$id/testcase $GLUSTERD;
if [ $? -ne 0 ]; then
echo -n "$global_bug_id: "
not_ok;
@@ -125,11 +125,10 @@ run_testcase ()
return 0;
fi
- for i in $(ls $cwd/dvm/ | grep "^[0-9]*$" | sort -n)
+ for i in $(ls dvm/ | grep "^[0-9]*$" | sort -n)
do
- if [ -f $cwd/dvm/$i/testcase ]; then
+ if [ -f ./dvm/$i/testcase ]; then
run_testcase $i;
- sleep 1;
fi
done
}
diff --git a/run.sh b/run.sh
index ddce608..0801999 100755
--- a/run.sh
+++ b/run.sh
@@ -29,10 +29,8 @@ _init ()
exit;
}
- export cwd=$(dirname $0);
- source $cwd/regression_helpers
+ source ./regression_helpers
export GLUSTERD=$1
-
bug_id=;
if [ $# -eq 2 ]; then
bug_id=$2;
@@ -41,7 +39,6 @@ _init ()
export glusterd_conf="/etc/glusterd";
export GLUSTERFSDIR=$(dirname $GLUSTERD);
- export GLUSTERDIR=$(dirname $GLUSTERFSDIR);
export VERSION_STR=$($GLUSTERD --version) 2>&1 1>/dev/null
export VERSION=$(echo $VERSION_STR|cut -d " " -f 2)