svn commit: samba r7442 - in branches/SAMBA_4_0/source/script/tests: .

[metze at samba.org]

Author: metze
Date: 2005-06-09 15:53:47 +0000 (Thu, 09 Jun 2005)
New Revision: 7442

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=7442

Log:
skip tests that require smbd, but smbd is down

metze
Modified:
   branches/SAMBA_4_0/source/script/tests/test_functions.sh
   branches/SAMBA_4_0/source/script/tests/test_local.sh


Changeset:
Modified: branches/SAMBA_4_0/source/script/tests/test_functions.sh
===================================================================
--- branches/SAMBA_4_0/source/script/tests/test_functions.sh	2005-06-09 15:51:36 UTC (rev 7441)
+++ branches/SAMBA_4_0/source/script/tests/test_functions.sh	2005-06-09 15:53:47 UTC (rev 7442)
@@ -3,6 +3,14 @@
 	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 @@
 		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

Modified: branches/SAMBA_4_0/source/script/tests/test_local.sh
===================================================================
--- branches/SAMBA_4_0/source/script/tests/test_local.sh	2005-06-09 15:51:36 UTC (rev 7441)
+++ branches/SAMBA_4_0/source/script/tests/test_local.sh	2005-06-09 15:53:47 UTC (rev 7442)
@@ -16,6 +16,10 @@
 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"