svn commit: samba r23201 - in branches/SAMBA_3_0_26/source: python/examples/tdbpack script script/tests

[jerry at samba.org]

Author: jerry
Date: 2007-05-29 14:38:31 +0000 (Tue, 29 May 2007)
New Revision: 23201

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

Log:
minor patches to make test and pythong examples from SAMBA-3_0
Modified:
   branches/SAMBA_3_0_26/source/python/examples/tdbpack/tdbtimetrial.py
   branches/SAMBA_3_0_26/source/python/examples/tdbpack/test_tdbpack.py
   branches/SAMBA_3_0_26/source/script/mkversion.sh
   branches/SAMBA_3_0_26/source/script/tests/selftest.sh
   branches/SAMBA_3_0_26/source/script/tests/test_posix_s3.sh


Changeset:
Modified: branches/SAMBA_3_0_26/source/python/examples/tdbpack/tdbtimetrial.py
===================================================================
--- branches/SAMBA_3_0_26/source/python/examples/tdbpack/tdbtimetrial.py	2007-05-29 14:26:27 UTC (rev 23200)
+++ branches/SAMBA_3_0_26/source/python/examples/tdbpack/tdbtimetrial.py	2007-05-29 14:38:31 UTC (rev 23201)
@@ -1,4 +1,4 @@
-#! /usr/bin/python2.2
+#! /usr/bin/python
 
 def run_trial():
     # import tdbutil

Modified: branches/SAMBA_3_0_26/source/python/examples/tdbpack/test_tdbpack.py
===================================================================
--- branches/SAMBA_3_0_26/source/python/examples/tdbpack/test_tdbpack.py	2007-05-29 14:26:27 UTC (rev 23200)
+++ branches/SAMBA_3_0_26/source/python/examples/tdbpack/test_tdbpack.py	2007-05-29 14:38:31 UTC (rev 23201)
@@ -1,4 +1,4 @@
-#! /usr/bin/env python2.2
+#! /usr/bin/env python
 
 __doc__ = """test case for samba.tdbpack functions
 

Modified: branches/SAMBA_3_0_26/source/script/mkversion.sh
===================================================================
--- branches/SAMBA_3_0_26/source/script/mkversion.sh	2007-05-29 14:26:27 UTC (rev 23200)
+++ branches/SAMBA_3_0_26/source/script/mkversion.sh	2007-05-29 14:38:31 UTC (rev 23201)
@@ -82,6 +82,13 @@
 	else
 	    TMP_SVK_REVISION_STR="${TMP_REVISION}-${USER}@${HOSTNAME}"
 	fi
+	if test x"${HAVESVK}" = x"no";then
+	    HAVEBZR=no
+	    bzr revno > /dev/null 2>&1 && HAVEBZR=yes
+	    TMP_BZR_REVNO=`bzr revno 2> /dev/null`
+	    TMP_BZR_NICK=`bzr nick 2> /dev/null`
+	    TMP_BZR_REVISION_STR="${TMP_BZR_NICK}-${TMP_BZR_REVNO}"
+	fi
     fi
 
     if test x"${HAVESVN}" = x"yes";then
@@ -89,6 +96,8 @@
 	    echo "#define SAMBA_VERSION_SVN_REVISION ${TMP_REVISION}" >> $OUTPUT_FILE
     elif test x"${HAVESVK}" = x"yes";then
 	    SAMBA_VERSION_STRING="${SAMBA_VERSION_STRING}-SVK-build-${TMP_SVK_REVISION_STR}"
+    elif test x"${HAVEBZR}" = x"yes";then
+	    SAMBA_VERSION_STRING="${SAMBA_VERSION_STRING}-BZR-build-${TMP_BZR_REVISION_STR}"
     else
 	    SAMBA_VERSION_STRING="${SAMBA_VERSION_STRING}-SVN-build-UNKNOWN"
     fi

Modified: branches/SAMBA_3_0_26/source/script/tests/selftest.sh
===================================================================
--- branches/SAMBA_3_0_26/source/script/tests/selftest.sh	2007-05-29 14:26:27 UTC (rev 23200)
+++ branches/SAMBA_3_0_26/source/script/tests/selftest.sh	2007-05-29 14:38:31 UTC (rev 23201)
@@ -95,8 +95,6 @@
 	log file = $LOGDIR/log.%m
 	log level = 0
 
-	passdb backend = tdbsam
-
 	name resolve order = bcast
 EOF
 
@@ -108,6 +106,8 @@
 	interfaces = $TORTURE_INTERFACES
 	panic action = $SCRIPTDIR/gdb_backtrace %d %\$(MAKE_TEST_BINARY)
 	include = $COMMONCONFFILE
+
+	passdb backend = tdbsam
 EOF
 
 cat >$SAMBA4CONFFILE<<EOF
@@ -126,11 +126,14 @@
 	panic action = $SCRIPTDIR/gdb_backtrace %d %\$(MAKE_TEST_BINARY)
 	include = $COMMONCONFFILE
 
+	passdb backend = tdbsam
+
 	; Necessary to add the build farm hacks
 	add user script = /bin/false
 	add machine script = /bin/false
 
 	kernel oplocks = no
+	kernel change notify = no
 
 	syslog = no
 	printing = bsd
@@ -212,7 +215,7 @@
 (
  # give time for nbt server to register its names
  echo "delaying for nbt name registration"
- sleep 4
+ sleep 10
  # This will return quickly when things are up, but be slow if we need to wait for (eg) SSL init 
  bin/nmblookup $CONFIGURATION -U $SERVER_IP __SAMBA__
  bin/nmblookup $CONFIGURATION __SAMBA__

Modified: branches/SAMBA_3_0_26/source/script/tests/test_posix_s3.sh
===================================================================
--- branches/SAMBA_3_0_26/source/script/tests/test_posix_s3.sh	2007-05-29 14:26:27 UTC (rev 23200)
+++ branches/SAMBA_3_0_26/source/script/tests/test_posix_s3.sh	2007-05-29 14:38:31 UTC (rev 23201)
@@ -49,8 +49,8 @@
 
 skipped="BASE-CHARSET BASE-DEFER_OPEN BASE-DELAYWRITE BASE-OPENATTR BASE-TCONDEV"
 skipped="$skipped RAW-ACLS RAW-COMPOSITE RAW-CONTEXT RAW-EAS"
-skipped="$skipped RAW-IOCTL RAW-MKDIR RAW-MUX RAW-NOTIFY RAW-OPEN"
-skipped="$skipped RAW-QFILEINFO RAW-QFSINFO RAW-RENAME RAW-SEARCH"
+skipped="$skipped RAW-IOCTL RAW-MUX"
+skipped="$skipped RAW-QFILEINFO RAW-QFSINFO RAW-SEARCH"
 skipped="$skipped RAW-SFILEINFO RAW-STREAMS RAW-WRITE"
 
 echo "WARNING: Skipping tests $skipped"