From d7a0c26af47507910ab8b9363b6c6f2e2815b3d3 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 16 Sep 2008 18:30:24 +0200
Subject: Move torture/ blackbox tests closer to code they're testing.

---
 source4/torture/tests/test_gentest.sh | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100755 source4/torture/tests/test_gentest.sh

(limited to 'source4/torture/tests/test_gentest.sh')

diff --git a/source4/torture/tests/test_gentest.sh b/source4/torture/tests/test_gentest.sh
new file mode 100755
index 0000000000..046f280f7d
--- /dev/null
+++ b/source4/torture/tests/test_gentest.sh
@@ -0,0 +1,34 @@
+#!/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
-- 
cgit 


From 3e5ba883b3dd82e5285d98b8c5083336c478ba04 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 16 Sep 2008 18:39:08 +0200
Subject: Fix paths to subunit.sh

---
 source4/torture/tests/test_gentest.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'source4/torture/tests/test_gentest.sh')

diff --git a/source4/torture/tests/test_gentest.sh b/source4/torture/tests/test_gentest.sh
index 046f280f7d..2f4d00dc77 100755
--- a/source4/torture/tests/test_gentest.sh
+++ b/source4/torture/tests/test_gentest.sh
@@ -17,10 +17,10 @@ DOMAIN=$4
 shift 4
 failed=0
 
-samba4bindir=`dirname $0`/../../source4/bin
+samba4bindir=`dirname $0`/../../bin
 gentest=$samba4bindir/gentest
 
-. `dirname $0`/subunit.sh
+. `dirname $0`/../../../testprogs/blackbox/subunit.sh
 
 cat <<EOF > st/gentest.ignore
 all_info.out.fname
@@ -29,6 +29,6 @@ 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
+rm -f st/gentest.ignore
 
 exit $failed
-- 
cgit