Merge branch 'master' of ssh://git.samba.org/data/git/samba into noejs

Conflicts:
	source4/main.mk

6 files changed, 0 insertions, 110 deletions

diff --git a/testprogs/blackbox/ndrdump/samr-CreateUser-in.dat b/testprogs/blackbox/ndrdump/samr-CreateUser-in.dat
deleted file mode 100644
index a5840e1f7fc..00000000000
--- a/testprogs/blackbox/ndrdump/samr-CreateUser-in.dat
+++ /dev/null
diff --git a/testprogs/blackbox/ndrdump/samr-CreateUser-out.dat b/testprogs/blackbox/ndrdump/samr-CreateUser-out.dat
deleted file mode 100644
index cf9131dba9f..00000000000
--- a/testprogs/blackbox/ndrdump/samr-CreateUser-out.dat
+++ /dev/null
diff --git a/testprogs/blackbox/test_gentest.sh b/testprogs/blackbox/test_gentest.sh
deleted file mode 100755
index 046f280f7d6..00000000000
--- a/testprogs/blackbox/test_gentest.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-# Blackbox tests for gentest
-# Copyright (C) 2008 Andrew Tridgell
-# based on test_smbclient.sh
-
-if [ $# -lt 4 ]; then
-cat <<EOF
-Usage: test_gentest.sh SERVER USERNAME PASSWORD DOMAIN
-EOF
-exit 1;
-fi
-
-SERVER=$1
-USERNAME=$2
-PASSWORD=$3
-DOMAIN=$4
-shift 4
-failed=0
-
-samba4bindir=`dirname $0`/../../source4/bin
-gentest=$samba4bindir/gentest
-
-. `dirname $0`/subunit.sh
-
-cat <<EOF > st/gentest.ignore
-all_info.out.fname
-internal_information.out.file_id
-EOF
-
-testit "gentest" $VALGRIND $gentest //$SERVER/test1 //$SERVER/test2 --num-ops=100 --ignore=st/gentest.ignore -W "$DOMAIN" -U"$USERNAME%$PASSWORD" -U"$USERNAME%$PASSWORD" $@ || failed=`expr $failed + 1`
-
-/bin/rm -f st/gentest.ignore
-
-exit $failed
diff --git a/testprogs/blackbox/test_locktest.sh b/testprogs/blackbox/test_locktest.sh
deleted file mode 100755
index 9cad4dafa29..00000000000
--- a/testprogs/blackbox/test_locktest.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-# Blackbox tests for locktest
-# Copyright (C) 2008 Andrew Tridgell
-# based on test_smbclient.sh
-
-if [ $# -lt 5 ]; then
-cat <<EOF
-Usage: test_locktest.sh SERVER USERNAME PASSWORD DOMAIN PREFIX
-EOF
-exit 1;
-fi
-
-SERVER=$1
-USERNAME=$2
-PASSWORD=$3
-DOMAIN=$4
-PREFIX=$5
-shift 5
-failed=0
-
-samba4bindir=`dirname $0`/../../source4/bin
-locktest=$samba4bindir/locktest
-
-. `dirname $0`/subunit.sh
-
-testit "locktest" $VALGRIND $locktest //$SERVER/test1 //$SERVER/test2 --num-ops=100  -W "$DOMAIN" -U"$USERNAME%$PASSWORD" $@ || failed=`expr $failed + 1`
-
-exit $failed
diff --git a/testprogs/blackbox/test_masktest.sh b/testprogs/blackbox/test_masktest.sh
deleted file mode 100755
index 440966261fc..00000000000
--- a/testprogs/blackbox/test_masktest.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-# Blackbox tests for masktest
-# Copyright (C) 2008 Andrew Tridgell
-# based on test_smbclient.sh
-
-if [ $# -lt 5 ]; then
-cat <<EOF
-Usage: test_masktest.sh SERVER USERNAME PASSWORD DOMAIN PREFIX
-EOF
-exit 1;
-fi
-
-SERVER=$1
-USERNAME=$2
-PASSWORD=$3
-DOMAIN=$4
-PREFIX=$5
-shift 5
-failed=0
-
-samba4bindir=`dirname $0`/../../source4/bin
-masktest=$samba4bindir/masktest
-
-. `dirname $0`/subunit.sh
-
-testit "masktest" $VALGRIND $masktest //$SERVER/tmp --num-ops=200 --dieonerror -W "$DOMAIN" -U"$USERNAME%$PASSWORD" $@ || failed=`expr $failed + 1`
-
-exit $failed
diff --git a/testprogs/blackbox/test_ndrdump.sh b/testprogs/blackbox/test_ndrdump.sh
deleted file mode 100755
index 50fd76ba927..00000000000
--- a/testprogs/blackbox/test_ndrdump.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-# Blackbox tests for masktest
-# Copyright (C) 2008 Andrew Tridgell
-# Copyright (C) 2008 Andrew Bartlett
-# based on test_smbclient.sh
-
-. `dirname $0`/subunit.sh
-
-failed=0
-
-samba4bindir=`dirname $0`/../../source4/bin
-ndrdump=$samba4bindir/ndrdump
-files=`dirname $0`/ndrdump
-
-testit "ndrdump with in" $VALGRIND $ndrdump samr samr_CreateUser in $files/samr-CreateUser-in.dat $@ || failed=`expr $failed + 1`
-testit "ndrdump with out" $VALGRIND $ndrdump samr samr_CreateUser out $files/samr-CreateUser-out.dat $@ || failed=`expr $failed + 1`
-testit "ndrdump with --context-file" $VALGRIND $ndrdump --context-file $files/samr-CreateUser-in.dat samr samr_CreateUser out $files/samr-CreateUser-out.dat $@ || failed=`expr $failed + 1`
-testit "ndrdump with validate" $VALGRIND $ndrdump --validate samr samr_CreateUser in $files/samr-CreateUser-in.dat $@ || failed=`expr $failed + 1`
-
-exit $failed