[SCM] Samba Shared Repository - branch master updated

Volker Lendecke vlendec at samba.org
Mon Apr 25 06:36:02 MDT 2011


The branch, master has been updated
       via  40e0079 s3: Some build farm machines do not have /bin/true
      from  b61c38f s3: Fix some typos in dsgetdcname

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 40e0079bae731f691a620a280b74ada951018458
Author: Volker Lendecke <vl at samba.org>
Date:   Mon Apr 25 13:40:15 2011 +0200

    s3: Some build farm machines do not have /bin/true
    
    Autobuild-User: Volker Lendecke <vlendec at samba.org>
    Autobuild-Date: Mon Apr 25 14:35:42 CEST 2011 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 source3/script/tests/test_pthreadpool.sh |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/script/tests/test_pthreadpool.sh b/source3/script/tests/test_pthreadpool.sh
index 79e578e..b1c7c6d 100755
--- a/source3/script/tests/test_pthreadpool.sh
+++ b/source3/script/tests/test_pthreadpool.sh
@@ -3,15 +3,18 @@
 incdir=`dirname $0`/../../../testprogs/blackbox
 . $incdir/subunit.sh
 
-TESTPROG=$BINDIR/pthreadpooltest
-
 if [ ! -x $BINDIR/pthreadpooltest ] ; then
-    TESTPROG=/bin/true
+    # Some machines don't have /bin/true, simulate it
+    cat >$BINDIR/pthreadpooltest <<EOF
+#!/bin/sh
+exit 0
+EOF
+    chmod +x $BINDIR/pthreadpooltest
 fi
 
 failed=0
 
-testit "pthreadpool" $VALGRIND $TESTPROG ||
+testit "pthreadpool" $VALGRIND $BINDIR/pthreadpooltest ||
 	failed=`expr $failed + 1`
 
 testok $0 $failed


-- 
Samba Shared Repository


More information about the samba-cvs mailing list