From 0b3cf400db35018000ceb84cdc20b55bc6c77aa3 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 19 Oct 2008 14:50:25 +0200
Subject: Fix formatting in selftest help output.

---
 selftest/selftest.pl | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'selftest')

diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index 1477d10d46..ebb88dde28 100755
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -283,12 +283,12 @@ sub ShowHelp()
 	print "Samba test runner
 Copyright (C) Jelmer Vernooij <jelmer\@samba.org>
 
-Usage: $Script [OPTIONS] PREFIX
+Usage: $Script [OPTIONS] TESTNAME-REGEX
 
 Generic options:
  --help                     this help page
  --target=samba[34]|win|kvm Samba version to target
- --testlist=FILE			file to read available tests from
+ --testlist=FILE	    file to read available tests from
 
 Paths:
  --prefix=DIR               prefix to run tests in [st]
@@ -296,14 +296,14 @@ Paths:
  --builddir=DIR             output directory [.]
 
 Target Specific:
- --socket-wrapper-pcap		save traffic to pcap directories
+ --socket-wrapper-pcap	    save traffic to pcap directories
  --socket-wrapper-keep-pcap keep all pcap files, not just those for tests that 
                             failed
  --socket-wrapper           enable socket wrapper
  --expected-failures=FILE   specify list of tests that is guaranteed to fail
 
 Samba4 Specific:
- --ldap=openldap|fedora-ds     back samba onto specified ldap server
+ --ldap=openldap|fedora-ds  back samba onto specified ldap server
 
 Samba3 Specific:
  --bindir=PATH              path to binaries
-- 
cgit 


From 1ba9867e7ae2f517e47edd67d7d41e48b6f55e5c Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 19 Oct 2008 14:53:55 +0200
Subject: Fix typo.

---
 selftest/output/plain.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'selftest')

diff --git a/selftest/output/plain.pm b/selftest/output/plain.pm
index 4e1e290534..82a73ab932 100644
--- a/selftest/output/plain.pm
+++ b/selftest/output/plain.pm
@@ -188,7 +188,7 @@ sub summary($)
 	}
 	close(SUMMARY);
 
-	print "\nA summary with detailed informations can be found in:\n  $self->{summaryfile}\n";
+	print "\nA summary with detailed information can be found in:\n  $self->{summaryfile}\n";
 
 	if ($#{$self->{suitesfailed}} == -1) {
 		my $ok = $self->{statistics}->{TESTS_EXPECTED_OK} + 
-- 
cgit 


From c0de338394c9e2dd80a3ad06341fe95b1ea169ed Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 19 Oct 2008 16:07:00 +0200
Subject: Move Samba4-specific code out of selftest.

---
 selftest/selftest.pl | 35 ++++++++++++++++++++---------------
 1 file changed, 20 insertions(+), 15 deletions(-)

(limited to 'selftest')

diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index ebb88dde28..d1e9c8d6c8 100755
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -588,24 +588,9 @@ sub write_clientconf($$)
 	close(CF);
 }
 
-my @torture_options = ();
-push (@torture_options, "--configfile=$conffile");
-# ensure any one smbtorture call doesn't run too long
-push (@torture_options, "--maximum-runtime=$torture_maxtime");
-push (@torture_options, "--target=$opt_target");
-push (@torture_options, "--basedir=$prefix_abs");
-push (@torture_options, "--option=torture:progress=no") unless ($opt_verbose);
-push (@torture_options, "--format=subunit");
-push (@torture_options, "--option=torture:quick=yes") if ($opt_quick);
-
-$ENV{TORTURE_OPTIONS} = join(' ', @torture_options);
-print "OPTIONS $ENV{TORTURE_OPTIONS}\n";
-
 my @todo = ();
 
 my $testsdir = "$srcdir/selftest";
-$ENV{SMB_CONF_PATH} = "$conffile";
-$ENV{CONFIGURATION} = "--configfile=$conffile";
 
 my %required_envs = ();
 
@@ -640,6 +625,26 @@ if ($#testlists == -1) {
 	die("No testlists specified");
 }
 
+$ENV{SELFTEST_PREFIX} = "$prefix_abs";
+if ($opt_socket_wrapper) {
+	$ENV{SELFTEST_INTERFACES} = $interfaces;
+} else {
+	$ENV{SELFTEST_INTERFACES} = "";
+}
+if ($opt_verbose) {
+	$ENV{SELFTEST_VERBOSE} = "1";
+} else {
+	$ENV{SELFTEST_VERBOSE} = "";
+}
+if ($opt_quick) {
+	$ENV{SELFTEST_QUICK} = "1";
+} else {
+	$ENV{SELFTEST_QUICK} = "";
+}
+$ENV{SELFTEST_TARGET} = $opt_target;
+$ENV{SELFTEST_MAXTIME} = $torture_maxtime;
+$ENV{SELFTEST_CONFFILE} = $conffile;
+
 my @available = ();
 foreach my $fn (@testlists) {
 	foreach (read_testlist($fn)) {
-- 
cgit 


From c3d8f472e8acbfd73fdd4707f70a3d153f62f033 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 20 Oct 2008 10:53:26 +0200
Subject: Export variables correctly for blackbox tests (thanks metze).

---
 selftest/selftest.pl | 1 +
 1 file changed, 1 insertion(+)

(limited to 'selftest')

diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index d1e9c8d6c8..60eabe41d6 100755
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -533,6 +533,7 @@ my $interfaces = join(',', ("127.0.0.6/8",
 			    "127.0.0.11/8"));
 
 my $conffile = "$prefix_abs/client/client.conf";
+$ENV{SMB_CONF_PATH} = $conffile;
 
 sub write_clientconf($$)
 {
-- 
cgit