summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2011-04-25 13:40:15 +0200
committerVolker Lendecke <vlendec@samba.org>2011-04-25 14:35:42 +0200
commit40e0079bae731f691a620a280b74ada951018458 (patch)
treea10a692c9779f76753e24c14cc675a076443e54f
parentb61c38fde6eee796097ae4f0cd4c3c31b052c599 (diff)
downloadsamba-40e0079bae731f691a620a280b74ada951018458.tar.gz
samba-40e0079bae731f691a620a280b74ada951018458.tar.bz2
samba-40e0079bae731f691a620a280b74ada951018458.zip
s3: Some build farm machines do not have /bin/true
Autobuild-User: Volker Lendecke <vlendec@samba.org> Autobuild-Date: Mon Apr 25 14:35:42 CEST 2011 on sn-devel-104
-rwxr-xr-xsource3/script/tests/test_pthreadpool.sh11
1 files changed, 7 insertions, 4 deletions
diff --git a/source3/script/tests/test_pthreadpool.sh b/source3/script/tests/test_pthreadpool.sh
index 79e578effa..b1c7c6da11 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