summaryrefslogtreecommitdiff
path: root/testprogs/blackbox/test_locktest.sh
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2008-04-17 09:36:09 +0200
committerAndrew Tridgell <tridge@samba.org>2008-04-17 09:36:09 +0200
commit30b9c37420100c98df1a538673d508e46517accf (patch)
tree33ccf13461371c1281a0fc707e66a814a3bc88e9 /testprogs/blackbox/test_locktest.sh
parent4bbaf36f6fd85c9d07a16320ad58d7a6ad43fd6c (diff)
parentbaad7a7e56e2b0f24885e01672cd9bdc6667a6a8 (diff)
downloadsamba-30b9c37420100c98df1a538673d508e46517accf.tar.gz
samba-30b9c37420100c98df1a538673d508e46517accf.tar.bz2
samba-30b9c37420100c98df1a538673d508e46517accf.zip
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
Conflicts: source/ntvfs/ntvfs_generic.c (This used to be commit a626a9c69cb2c07c8de69dcfe45361f86d6de58d)
Diffstat (limited to 'testprogs/blackbox/test_locktest.sh')
-rwxr-xr-xtestprogs/blackbox/test_locktest.sh15
1 files changed, 1 insertions, 14 deletions
diff --git a/testprogs/blackbox/test_locktest.sh b/testprogs/blackbox/test_locktest.sh
index c08b408107..88fa0ef892 100755
--- a/testprogs/blackbox/test_locktest.sh
+++ b/testprogs/blackbox/test_locktest.sh
@@ -21,20 +21,7 @@ failed=0
samba4bindir=`dirname $0`/../../source/bin
locktest=$samba4bindir/locktest
-testit() {
- name="$1"
- shift
- cmdline="$*"
- echo "test: $name"
- $cmdline
- status=$?
- if [ x$status = x0 ]; then
- echo "success: $name"
- else
- echo "failure: $name"
- fi
- return $status
-}
+. `dirname $0`/subunit.sh
testit "locktest" $VALGRIND $locktest //$SERVER/test1 //$SERVER/test2 --num-ops=100 -W "$DOMAIN" -U"$USERNAME%$PASSWORD" $@ || failed=`expr $failed + 1`