Atin Mukherjee <amukherj@xxxxxxxxxx> wrote:
> > NetBSD fixes for the tests themselves were not backported to
> > release-3.6. At the beginning it was no problem since jenkins was
> > configured to not run NetBSD tests for release-3.6. And then someone
> > changed it and you got failures.
> So do I take this as we can continue to ignore the BSD part of failures
> in 3.6?
Yes, but this is a dangerous procedure since someone may forget about the
situation and start ignoring on other branches. It would be better if NetBSD
regression could validate without running the tests if release-3.6 is the
checked out branch.
If someone has enough energy to have this passes through the various tests, it
would be nice to have it on all branches:
diff --git a/run-tests.sh b/run-tests.sh
index a69a8fa..c300e73 100755
--- a/run-tests.sh
+++ b/run-tests.sh
@@ -114,6 +114,35 @@ function check_user()
fi
}
+function check_version()
+{
+ rev=`glusterd -V |\
+ sed -n '1s/^glusterfs \([0-9]\{1,\}\)\.\([0-9]\{1,\}\).*/\1.\2/p'`
+ branch="branch-${rev}"
+ major=${rev%.*}
+ minor=${rev#*.}
+ os=`uname -s`
+ skip=0
+
+ case ${os} in
+ NetBSD)
+ test ${major} -lt 3 && skip=1
+ test ${major} -eq 3 -a ${minor} -lt 7 && skip=1
+ ;;
+ FreeBSD)
+ skip=1
+ ;;
+ Darwin)
+ skip=1
+ ;;
+ esac
+
+ if [ ${skip} -eq 1 ] ; then
+ echo "${os} tests unsupported for ${branch}, validating by default"
+ exit 0;
+ fi
+}
+
function run_tests()
{
declare -A DONE
@@ -300,6 +329,9 @@ done
# Make sure we're running as the root user
check_user
+# Check for unsupported OS/glusterFS branch
+check_version
+
# Make sure the needed programs are available
check_dependencies
--
Emmanuel Dreyfus
http://hcpnet.free.fr/pubz
manu@xxxxxxxxxx
_______________________________________________
Gluster-devel mailing list
Gluster-devel@xxxxxxxxxxx
http://www.gluster.org/mailman/listinfo/gluster-devel
