Print number of slow tests from script rather than wscript.

Change-Id: I6eaa0803b95cc81f514a2176f4e06f1e3fff4077
Signed-Off-By: Jelmer Vernooij <jelmer@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Autobuild-User(master): Jelmer Vernooij <jelmer@samba.org>
Autobuild-Date(master): Mon Nov 24 13:06:46 CET 2014 on sn-devel-104

diff --git a/script/show_testsuite_time b/script/show_testsuite_time
index fb9ea2f94f44e5270be15ecaf0fae8c2fd068d48..6e5808a01152a6ca1f93011b3f15a8590a561975 100755 (executable)
--- a/script/show_testsuite_time
+++ b/script/show_testsuite_time
@@ -22,6 +22,8 @@ if ($#ARGV >= 1) {
        }
 }
 
+print "TOP $max slowest tests\n";
+
 while(<$fh>)
 {
        if (m/^testsuite: (.*)/) {

diff --git a/selftest/wscript b/selftest/wscript
index fd925311a2a657fc71ec922dd7d3b49305faa0b7..cf57adc83f315f1e3772de3e0dc019ae9595d9e0 100644 (file)
--- a/selftest/wscript
+++ b/selftest/wscript
@@ -135,10 +135,10 @@ def cmd_testonly(opt):
                       'nmblookup4:nmblookup4,' +
                       'smbclient3:smbclient,' +
                       'smbclient4:smbclient4,' +
-                      'smbtorture4:smbtorture,' + 
+                      'smbtorture4:smbtorture,' +
                       'ntlm_auth3:ntlm_auth')
 
-    env.OPTIONS = '--binary-mapping=%s' % binary_mapping 
+    env.OPTIONS = '--binary-mapping=%s' % binary_mapping
     if not Options.options.SLOWTEST:
         env.OPTIONS += ' --exclude=${srcdir}/selftest/slow'
     if Options.options.QUICKTEST:
@@ -241,7 +241,6 @@ def cmd_testonly(opt):
     subunit_file = "%s/subunit" % env.SELFTEST_PREFIX
     if os.path.exists(subunit_file):
         nb = Options.options.NB_SLOWEST
-        print "TOP %d slowest tests" % nb
         cmd = "./script/show_testsuite_time %s %d" % (subunit_file, nb)
         runcmd = EXPAND_VARIABLES(opt, cmd)
         RUN_COMMAND(runcmd, env=env)