summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2005-06-09 15:53:47 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:17:54 -0500
commit4140ccd0dd9a4570992c1a5b4b688aaab6c1c050 (patch)
treeb4a1a6639b5f83ffe6e7d7732a91bb37cf940a71 /source4
parent84ee48e3e9c9f5f4f33ef61b012032eac0e58a17 (diff)
downloadsamba-4140ccd0dd9a4570992c1a5b4b688aaab6c1c050.tar.gz
samba-4140ccd0dd9a4570992c1a5b4b688aaab6c1c050.tar.bz2
samba-4140ccd0dd9a4570992c1a5b4b688aaab6c1c050.zip
r7442: skip tests that require smbd, but smbd is down
metze (This used to be commit dad79155624808aa85c34921f05d2e0cded6ad12)
Diffstat (limited to 'source4')
-rw-r--r--source4/script/tests/test_functions.sh12
-rwxr-xr-xsource4/script/tests/test_local.sh4
2 files changed, 14 insertions, 2 deletions
diff --git a/source4/script/tests/test_functions.sh b/source4/script/tests/test_functions.sh
index 50b581c69b..e493a74ec6 100644
--- a/source4/script/tests/test_functions.sh
+++ b/source4/script/tests/test_functions.sh
@@ -3,6 +3,14 @@ testit() {
shift 1
trap "rm -f test.$$" EXIT
cmdline="$*"
+
+ if [ -n "$SMBD_TEST_FIFO" ];then
+ if [ ! -p "$SMBD_TEST_FIFO" ];then
+ echo "TEST SKIPPED: $name (reason: smbd is down)";
+ return 0;
+ fi
+ fi
+
if [ x"$RUN_FROM_BUILD_FARM" = x"yes" ];then
echo "--==--==--==--==--==--==--==--==--==--==--"
echo "Running test $name (level 0 stdout)"
@@ -19,10 +27,10 @@ testit() {
rm -f test.$$;
if [ x"$RUN_FROM_BUILD_FARM" = x"yes" ];then
echo "=========================================="
- echo "TEST FAILED: $name (status $ret)"
+ echo "TEST FAILED: $name (status $status)"
echo "=========================================="
else
- echo "TEST FAILED: $name (status $ret)"
+ echo "TEST FAILED: $name (status $status)"
fi
return 1;
fi
diff --git a/source4/script/tests/test_local.sh b/source4/script/tests/test_local.sh
index 259864c200..372067323f 100755
--- a/source4/script/tests/test_local.sh
+++ b/source4/script/tests/test_local.sh
@@ -16,6 +16,10 @@ fi
incdir=`dirname $0`
. $incdir/test_functions.sh
+# the local tests doesn't need smbd
+SMBD_TEST_FIFO=""
+export SMBD_TEST_FIFO
+
failed=0
for t in $local_tests; do
name="$t"