From 28ad50e5fd1887fff149d05793b2dabe5a08051a Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Sun, 11 Sep 2011 08:16:50 +1000
Subject: s3-selftest: Set path to bin/net and bin/wbinfo in command line to
 test scripts

This makes it easier to reproduce these tests outside the test
environment, as we rely less on environment variables.

Andrew Bartlett
---
 source3/script/tests/test_net_registry_roundtrip.sh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'source3/script/tests/test_net_registry_roundtrip.sh')

diff --git a/source3/script/tests/test_net_registry_roundtrip.sh b/source3/script/tests/test_net_registry_roundtrip.sh
index 72bc693557..050311a814 100755
--- a/source3/script/tests/test_net_registry_roundtrip.sh
+++ b/source3/script/tests/test_net_registry_roundtrip.sh
@@ -7,17 +7,18 @@
 
 if [ $# -lt 3 ]; then
 cat <<EOF
-Usage: test_net_registry_roundtrip.sh SCRIPTDIR SERVERCONFFILE PREFIX CONFIGURATION
+Usage: test_net_registry_roundtrip.sh SCRIPTDIR SERVERCONFFILE NET CONFIGURATION RPC
 EOF
 exit 1;
 fi
 
 SCRIPTDIR="$1"
 SERVERCONFFILE="$2"
-CONFIGURATION="$3"
-RPC="$4"
+NET="$3"
+CONFIGURATION="$4"
+RPC="$5"
 
-NET="$VALGRIND ${NET:-$BINDIR/net} $CONFIGURATION"
+NET="$VALGRIND ${NET} $CONFIGURATION"
 
 if test "x${RPC}" = "xrpc" ; then
 	NETCMD="${NET} -U${USERNAME}%${PASSWORD} -I ${SERVER_IP} rpc"
-- 
cgit