summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmmanuel Dreyfus <manu@netbsd.org>2014-10-29 01:17:25 +0100
committerVijay Bellur <vbellur@redhat.com>2014-10-30 01:37:17 -0700
commitfb2e0a4afbe3263ebda3e1d2b72d921b2d7e2c50 (patch)
tree1e8f47abc6e39e7f25a098b08238db5ef919f4ed
parent886eb63fc729d3effea292ef92e02168898d8205 (diff)
Regression test portability: TAP
Even with successful tests on NetBSD, we had a failure message at the end: "No plan found in TAP output" This was caused by a white space left padded numerical variable. Stripping the white spaces fixes the problem. While there add SKIP_TEST for NetBSD on unspported tests so that it does not triger a failure. BUG: 1129939 Change-Id: I8d0bc125c4208974657977568d838ee2dd19783c Signed-off-by: Emmanuel Dreyfus <manu@netbsd.org> Reviewed-on: http://review.gluster.org/8981 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Vijay Bellur <vbellur@redhat.com>
-rwxr-xr-xtests/basic/bd.t1
-rw-r--r--tests/include.rc2
-rwxr-xr-xtests/snapshot.rc1
3 files changed, 3 insertions, 1 deletions
diff --git a/tests/basic/bd.t b/tests/basic/bd.t
index 7e3637492a3..63622edd709 100755
--- a/tests/basic/bd.t
+++ b/tests/basic/bd.t
@@ -74,6 +74,7 @@ function volume_type()
case $OSTYPE in
NetBSD)
echo "Skip test on LVM which is not available on NetBSD" >&2
+ SKIP_TESTS
exit 0
;;
*)
diff --git a/tests/include.rc b/tests/include.rc
index 1a0fb06002f..28d4ab744ff 100644
--- a/tests/include.rc
+++ b/tests/include.rc
@@ -97,7 +97,7 @@ for line in $expect_tests; do
done
IFS=$x_ifs
-echo 1..$testcnt
+echo "1..`echo $testcnt`"
t=1
diff --git a/tests/snapshot.rc b/tests/snapshot.rc
index 5186b77fe04..cddbb49584a 100755
--- a/tests/snapshot.rc
+++ b/tests/snapshot.rc
@@ -394,6 +394,7 @@ function check_if_snapd_exist() {
case $OSTYPE in
NetBSD)
echo "Skip test on LVM which is not available on NetBSD" >&2
+ SKIP_TESTS
exit 0
;;
*)