From 26ed05364d3172f17a0d4e1159e39a830f8a7217 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 1 Sep 2007 19:16:22 +0000
Subject: r24866: Put remainder of binding string tests in librpc/ directory.
 (This used to be commit 5b78d845a4d107e6a0e77a6e57e2b0e22fc0db95)

---
 source4/selftest/test_binding_string.sh | 18 ------------------
 source4/selftest/test_ldap.sh           |  6 ++----
 source4/selftest/tests_all.sh           |  1 -
 3 files changed, 2 insertions(+), 23 deletions(-)
 delete mode 100755 source4/selftest/test_binding_string.sh

(limited to 'source4/selftest')

diff --git a/source4/selftest/test_binding_string.sh b/source4/selftest/test_binding_string.sh
deleted file mode 100755
index 79ec482ba6..0000000000
--- a/source4/selftest/test_binding_string.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-incdir=`dirname $0`
-. $incdir/test_functions.sh
-
-for I in "ncacn_np:\$SERVER" \
-		 "ncacn_ip_tcp:\$SERVER" \
-		 "ncacn_np:\$SERVER[rpcecho]"  \
-		 "ncacn_np:\$SERVER[/pipe/rpcecho]" \
-		 "ncacn_np:\$SERVER[/pipe/rpcecho,sign,seal]" \
-		 "ncacn_np:\$SERVER[,sign]" \
-		 "ncacn_ip_tcp:\$SERVER[,sign]" \
-		 "ncalrpc:" \
-		 "308FB580-1EB2-11CA-923B-08002B1075A7@ncacn_np:\$SERVER" \
-		 "308FB580-1EB2-11CA-923B-08002B1075A7@ncacn_ip_tcp:\$SERVER" 
-do
-	plantest "$I" dc $samba4bindir/smbtorture $TORTURE_OPTIONS "$I" -U"\$USERNAME"%"\$PASSWORD" -W "\$DOMAIN" --option=torture:quick=yes RPC-ECHO "$*"
-done
diff --git a/source4/selftest/test_ldap.sh b/source4/selftest/test_ldap.sh
index 3eba604358..85c3f95915 100755
--- a/source4/selftest/test_ldap.sh
+++ b/source4/selftest/test_ldap.sh
@@ -4,15 +4,13 @@
 incdir=`dirname $0`
 . $incdir/test_functions.sh
 
-p=ldap
 for options in "" "--option=socket:testnonblock=true" "-U\$USERNAME%\$PASSWORD --option=socket:testnonblock=true" "-U\$USERNAME%\$PASSWORD"; do
-    plantest "TESTING PROTOCOL $p with options $options" dc $samba4srcdir/../testprogs/blackbox/test_ldb.sh $p \$SERVER_IP $options
+    plantest "TESTING PROTOCOL ldap with options $options" dc $samba4srcdir/../testprogs/blackbox/test_ldb.sh ldap \$SERVER_IP $options
 done
 # see if we support ldaps
 if grep ENABLE_GNUTLS.1 include/config.h > /dev/null; then
-    p=ldaps
     for options in "" "-U\$USERNAME%\$PASSWORD"; do
-	plantest "TESTING PROTOCOL $p with options $options" dc $samba4srcdir/../testprogs/blackbox/test_ldb.sh $p \$SERVER_IP $options
+	plantest "TESTING PROTOCOL ldaps with options $options" dc $samba4srcdir/../testprogs/blackbox/test_ldb.sh ldaps \$SERVER_IP $options
     done
 fi
 for t in LDAP-CLDAP LDAP-BASIC LDAP-SCHEMA LDAP-UPTODATEVECTOR
diff --git a/source4/selftest/tests_all.sh b/source4/selftest/tests_all.sh
index 868d4cfe3e..b2fa0b1430 100755
--- a/source4/selftest/tests_all.sh
+++ b/source4/selftest/tests_all.sh
@@ -5,7 +5,6 @@ $SRCDIR/selftest/test_nbt.sh "dc"
 $SRCDIR/selftest/test_rpc.sh
 $SRCDIR/selftest/test_net.sh
 $SRCDIR/selftest/test_session_key.sh
-$SRCDIR/selftest/test_binding_string.sh
 $SRCDIR/selftest/test_echo.sh
 $SRCDIR/selftest/test_posix.sh
 $SRCDIR/selftest/test_cifs.sh
-- 
cgit