From b7a8d9a42edd69b757f2f763d24571600a3c19a9 Mon Sep 17 00:00:00 2001 From: Raghavendra Bhat Date: Tue, 6 Sep 2011 19:35:57 +0530 Subject: some changes for the regression framework and regression testcases for some bugs --- dvm/2010/testcase | 2 +- dvm/2033/testcase | 2 +- dvm/2099/testcase | 2 +- dvm/2140/testcase | 2 +- dvm/2145/testcase | 2 +- dvm/2154/testcase | 2 +- dvm/2294/testcase | 2 +- dvm/2369/testcase | 2 +- dvm/2426/testcase | 2 +- dvm/2483/testcase | 2 +- dvm/2501/testcase | 2 +- dvm/2623/testcase | 2 +- dvm/2742/testcase | 2 +- regression_helpers | 9 +++++---- run.sh | 5 ++++- 15 files changed, 22 insertions(+), 18 deletions(-) diff --git a/dvm/2010/testcase b/dvm/2010/testcase index d14f338..e3052b7 100755 --- a/dvm/2010/testcase +++ b/dvm/2010/testcase @@ -1,6 +1,6 @@ #!/bin/bash -source ./regression_helpers +source $cw$cwd/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 03d0879..a888928 100755 --- a/dvm/2033/testcase +++ b/dvm/2033/testcase @@ -1,6 +1,6 @@ #!/bin/bash -source ./regression_helpers +source $cwd/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 c7f5d82..08c84e4 100755 --- a/dvm/2099/testcase +++ b/dvm/2099/testcase @@ -1,6 +1,6 @@ #!/bin/bash -source ./regression_helpers +source $cwd/regression_helpers VOLNAME="volley" diff --git a/dvm/2140/testcase b/dvm/2140/testcase index 34b7d5e..28deb0c 100755 --- a/dvm/2140/testcase +++ b/dvm/2140/testcase @@ -1,6 +1,6 @@ #!/bin/bash -source ./regression_helpers +source $cwd/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 afeee55..969c522 100755 --- a/dvm/2145/testcase +++ b/dvm/2145/testcase @@ -1,6 +1,6 @@ #!/bin/bash -source ./regression_helpers +source $cwd/regression_helpers VOLNAME="vol$global_bug_id"; diff --git a/dvm/2154/testcase b/dvm/2154/testcase index 50b58c0..a3f8730 100755 --- a/dvm/2154/testcase +++ b/dvm/2154/testcase @@ -1,6 +1,6 @@ #!/bin/bash -source ./regression_helpers +source $cwd/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 b0d8674..2f984cf 100755 --- a/dvm/2294/testcase +++ b/dvm/2294/testcase @@ -1,6 +1,6 @@ #!/bin/bash -source ./regression_helpers +source $cwd/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 f25af14..2ad2557 100755 --- a/dvm/2369/testcase +++ b/dvm/2369/testcase @@ -1,6 +1,6 @@ #!/bin/bash -source ./regression_helpers +source $cwd/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 4c5dda9..1c9e750 100755 --- a/dvm/2426/testcase +++ b/dvm/2426/testcase @@ -1,6 +1,6 @@ #!/bin/bash -source ./regression_helpers +source $cwd/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 ba62402..a0a85d2 100755 --- a/dvm/2483/testcase +++ b/dvm/2483/testcase @@ -1,6 +1,6 @@ #!/bin/bash -source ./regression_helpers +source $cwd/regression_helpers VOLNAME="vol$global_bug_id" diff --git a/dvm/2501/testcase b/dvm/2501/testcase index 63561c5..4702b00 100755 --- a/dvm/2501/testcase +++ b/dvm/2501/testcase @@ -1,6 +1,6 @@ #!/bin/bash -source ./regression_helpers +source $cwd/regression_helpers VOLNAME="vol$global_bug_id"; diff --git a/dvm/2623/testcase b/dvm/2623/testcase index 48b209a..b90c3eb 100755 --- a/dvm/2623/testcase +++ b/dvm/2623/testcase @@ -1,6 +1,6 @@ #!/bin/bash -source ./regression_helpers +source $cwd/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 062c144..800924e 100755 --- a/dvm/2742/testcase +++ b/dvm/2742/testcase @@ -1,6 +1,6 @@ #!/bin/bash -source ./regression_helpers +source $cwd/regression_helpers VOLNAME="vol$global_bug_id"; diff --git a/regression_helpers b/regression_helpers index cf0e343..b373d1b 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 ./dvm/$id/testcase ]; then + if [ -f $cwd/dvm/$id/testcase ]; then create_directory $FUSE_MOUNT; create_directory $NFS_MOUNT; - ./dvm/$id/testcase $GLUSTERD; + $cwd/dvm/$id/testcase $GLUSTERD; if [ $? -ne 0 ]; then echo -n "$global_bug_id: " not_ok; @@ -125,10 +125,11 @@ run_testcase () return 0; fi - for i in $(ls dvm/ | grep "^[0-9]*$" | sort -n) + for i in $(ls $cwd/dvm/ | grep "^[0-9]*$" | sort -n) do - if [ -f ./dvm/$i/testcase ]; then + if [ -f $cwd/dvm/$i/testcase ]; then run_testcase $i; + sleep 1; fi done } diff --git a/run.sh b/run.sh index 0801999..ddce608 100755 --- a/run.sh +++ b/run.sh @@ -29,8 +29,10 @@ _init () exit; } - source ./regression_helpers + export cwd=$(dirname $0); + source $cwd/regression_helpers export GLUSTERD=$1 + bug_id=; if [ $# -eq 2 ]; then bug_id=$2; @@ -39,6 +41,7 @@ _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) -- cgit