summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVijay Bellur <vbellur@redhat.com>2015-04-28 23:48:18 +0530
committerVijay Bellur <vbellur@redhat.com>2015-04-29 01:38:36 -0700
commit7e2baf9acda16cacf3410c22229889f362853384 (patch)
tree8e4426847be7d25bc0e560dc2e5aa4908d2c25dc
parentde909177699bdf0e084476e8191834be56edd9b0 (diff)
tests: sync run-tests.sh from masterv3.7.0beta1
A few commits going out of order for run-tests.sh between master and release-3.7 cause problems with cherrypicking patches for the file accepted on master. Since run-tests.sh does not contain any branch specific code, this change would be fine for release-3.7. Change-Id: I6da42a0a16293e108301f470a686c596dd70b82c BUG: 1212676 Signed-off-by: Vijay Bellur <vbellur@redhat.com> Reviewed-on: http://review.gluster.org/10434 Tested-by: NetBSD Build System Reviewed-by: Jeff Darcy <jdarcy@redhat.com> Tested-by: Gluster Build System <jenkins@build.gluster.com>
-rwxr-xr-xrun-tests.sh25
1 files changed, 14 insertions, 11 deletions
diff --git a/run-tests.sh b/run-tests.sh
index 527d4ab..3474ce9 100755
--- a/run-tests.sh
+++ b/run-tests.sh
@@ -164,7 +164,8 @@ function run_tests()
return $match
}
RES=0
- for t in $(find ${regression_testsdir}/tests | LC_COLLATE=C sort) ; do
+ for t in $(find ${regression_testsdir}/tests | grep -v geo-rep \
+ | LC_COLLATE=C sort) ; do
if match $t "$@" ; then
if [ -d $t ] ; then
echo "Running tests in directory $t"
@@ -193,20 +194,22 @@ function run_tests()
function is_bad_test ()
{
local name=$1
- for bt in ./tests/basic/volume-snapshot-clone.t \
- ./tests/basic/uss.t \
- ./tests/features/glupy.t; do
+ for bt in ./tests/basic/volume-snapshot-clone.t \
+ ./tests/basic/uss.t \
+ ./tests/basic/ec/ec-12-4.t \
+ ./tests/features/glupy.t; do
[ x"$name" = x"$bt" ] && return 0 # bash: zero means true/success
done
- return 1 # bash: non-zero means false/failure
+ return 1 # bash: non-zero means false/failure
}
function run_all ()
{
find ${regression_testsdir}/tests -name '*.t' \
+ | grep -v geo-rep \
| LC_COLLATE=C sort \
| while read t; do
- old_cores=$(ls /core.* 2> /dev/null | wc -l)
+ old_cores=$(ls /core.* 2> /dev/null | wc -l)
retval=0
prove -f --timer $t
TMP_RES=$?
@@ -221,11 +224,11 @@ function run_all ()
retval=$((retval+2))
fi
if [ $retval -ne 0 ]; then
- if is_bad_test $t; then
- echo "Ignoring failure from known-bad test $t"
- else
- return $retval
- fi
+ if is_bad_test $t; then
+ echo "Ignoring failure from known-bad test $t"
+ else
+ return $retval
+ fi
fi
done
}