Fix and test python scripts and kerberos

[samba.git] / source4 / selftest / selftest.pl

diff --git a/source4/selftest/selftest.pl b/source4/selftest/selftest.pl
index aa4423c7e2d551eb2068e6cacef2b3caebb1c085..39a1b5a45089be203d4da12aa4dd4730f3a0b6b6 100755 (executable)
--- a/source4/selftest/selftest.pl
+++ b/source4/selftest/selftest.pl
@@ -204,7 +204,7 @@ sub getlog_env($);
 
 sub setup_pcap($)
 {
-       my ($state, $name) = @_;
+       my ($name) = @_;
 
        return unless ($opt_socket_wrapper_pcap);
        return unless defined($ENV{SOCKET_WRAPPER_PCAP_DIR});
@@ -584,7 +584,7 @@ push (@torture_options, "--configfile=$conffile");
 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") if ($opt_format eq "buildfarm");
+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);