From b73a05e4e184238614d73c1519f2880cd946908d Mon Sep 17 00:00:00 2001
From: Kai Blin <kai@samba.org>
Date: Sat, 23 Oct 2010 19:27:26 -0700
Subject: s4 net: rename to samba-tool in order to not clash with s3 net

Autobuild-User: Kai Blin <kai@samba.org>
Autobuild-Date: Thu Oct 28 07:25:16 UTC 2010 on sn-devel-104
---
 source4/utils/tests/test_net.sh        | 40 ----------------------------------
 source4/utils/tests/test_samba_tool.sh | 40 ++++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 40 deletions(-)
 delete mode 100755 source4/utils/tests/test_net.sh
 create mode 100755 source4/utils/tests/test_samba_tool.sh

(limited to 'source4/utils/tests')

diff --git a/source4/utils/tests/test_net.sh b/source4/utils/tests/test_net.sh
deleted file mode 100755
index 09394f41be..0000000000
--- a/source4/utils/tests/test_net.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/sh
-# Blackbox tests for net
-
-SERVER=$1
-USERNAME=$2
-PASSWORD=$3
-DOMAIN=$4
-shift 4
-
-failed=0
-
-samba4bindir="$BUILDDIR/bin"
-smbclient="$samba4bindir/smbclient$EXEEXT"
-net="$samba4bindir/net$EXEEXT"
-
-testit() {
-	name="$1"
-	shift
-	cmdline="$*"
-	echo "test: $name"
-	$cmdline
-	status=$?
-	if [ x$status = x0 ]; then
-		echo "success: $name"
-	else
-		echo "failure: $name"
-		failed=`expr $failed + 1`
-	fi
-	return $status
-}
-
-testit "Test login with --machine-pass without kerberos" $VALGRIND $smbclient -c 'ls' $CONFIGURATION //$SERVER/tmp --machine-pass -k no
-
-testit "Test login with --machine-pass and kerberos" $VALGRIND $smbclient -c 'ls' $CONFIGURATION //$SERVER/tmp --machine-pass -k yes
-
-testit "time" $VALGRIND $net time $SERVER $CONFIGURATION  -W "$DOMAIN" -U"$USERNAME%$PASSWORD" $@
-
-# FIXME: testit "domainlevel.show" $VALGRIND $net domainlevel show $CONFIGURATION
-
-exit $failed
diff --git a/source4/utils/tests/test_samba_tool.sh b/source4/utils/tests/test_samba_tool.sh
new file mode 100755
index 0000000000..0fb4c2afa8
--- /dev/null
+++ b/source4/utils/tests/test_samba_tool.sh
@@ -0,0 +1,40 @@
+#!/bin/sh
+# Blackbox tests for samba-tool
+
+SERVER=$1
+USERNAME=$2
+PASSWORD=$3
+DOMAIN=$4
+shift 4
+
+failed=0
+
+samba4bindir="$BUILDDIR/bin"
+smbclient="$samba4bindir/smbclient$EXEEXT"
+samba_tool="$samba4bindir/samba-tool$EXEEXT"
+
+testit() {
+	name="$1"
+	shift
+	cmdline="$*"
+	echo "test: $name"
+	$cmdline
+	status=$?
+	if [ x$status = x0 ]; then
+		echo "success: $name"
+	else
+		echo "failure: $name"
+		failed=`expr $failed + 1`
+	fi
+	return $status
+}
+
+testit "Test login with --machine-pass without kerberos" $VALGRIND $smbclient -c 'ls' $CONFIGURATION //$SERVER/tmp --machine-pass -k no
+
+testit "Test login with --machine-pass and kerberos" $VALGRIND $smbclient -c 'ls' $CONFIGURATION //$SERVER/tmp --machine-pass -k yes
+
+testit "time" $VALGRIND $samba_tool time $SERVER $CONFIGURATION  -W "$DOMAIN" -U"$USERNAME%$PASSWORD" $@
+
+# FIXME: testit "domainlevel.show" $VALGRIND $samba_tool domainlevel show $CONFIGURATION
+
+exit $failed
-- 
cgit