From de66bced9468b338e94d430a474616016c6078a5 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 12 Aug 2007 04:00:15 +0000 Subject: [PATCH] r24345: Add --format=html option to selftest. --- source/main.mk | 3 + source/samba4-knownfail | 1 + source/selftest/output/buildfarm.pm | 7 ++ source/selftest/output/html.pm | 130 ++++++++++++++++++++++++++++ source/selftest/output/plain.pm | 7 ++ source/selftest/selftest.pl | 27 ++++-- 6 files changed, 166 insertions(+), 9 deletions(-) create mode 100644 source/selftest/output/html.pm diff --git a/source/main.mk b/source/main.mk index f99cb3c630e..f2412d33d51 100644 --- a/source/main.mk +++ b/source/main.mk @@ -289,6 +289,9 @@ SELFTEST = $(PERL) $(srcdir)/selftest/selftest.pl --prefix=${selftest_prefix} \ --skip=$(srcdir)/samba4-skip \ $(TEST_OPTIONS) +htmltest: everything + $(SELFTEST) $(DEFAULT_TEST_OPTIONS) --format=html $(TESTS) + test: everything $(SELFTEST) $(DEFAULT_TEST_OPTIONS) --immediate $(TESTS) diff --git a/source/samba4-knownfail b/source/samba4-knownfail index 0caf59ae4fb..e7f4560ec18 100644 --- a/source/samba4-knownfail +++ b/source/samba4-knownfail @@ -8,3 +8,4 @@ RAW-OPLOCK/OPLOCK RPC-WINREG RPC-WKSSVC.*NetWkstaGetInfo RPC-WKSSVC.*NetWkstaTransportEnum +blackbox.smbclient.*USER.*PASSWD diff --git a/source/selftest/output/buildfarm.pm b/source/selftest/output/buildfarm.pm index 11d65d7306b..a605f1736cc 100644 --- a/source/selftest/output/buildfarm.pm +++ b/source/selftest/output/buildfarm.pm @@ -92,4 +92,11 @@ sub missing_env($$$) print "FAIL: $name (ENV[$envname] not available!)\n"; } +sub skip_testsuite($$) +{ + my ($self, $name) = @_; + + print "SKIPPED: $name\n"; +} + 1; diff --git a/source/selftest/output/html.pm b/source/selftest/output/html.pm new file mode 100644 index 00000000000..6e83d811e87 --- /dev/null +++ b/source/selftest/output/html.pm @@ -0,0 +1,130 @@ +#!/usr/bin/perl + +package output::html; +use Exporter; +@ISA = qw(Exporter); + +use strict; + +sub new($$$$) { + my ($class, $dirname, $statistics) = @_; + my $self = { + dirname => $dirname, + statistics => $statistics, + active_test => undef, + msg => "" + }; + + open(INDEX, ">$dirname/index.html"); + + print INDEX "\n"; + print INDEX "\n"; + print INDEX "\n"; + print INDEX "\n"; + + $self->{INDEX} = *INDEX; + + bless($self, $class); +} + +sub output_msg($$$); + +sub start_testsuite($$) +{ + my ($self, $state) = @_; + + $state->{HTMLFILE} = "$state->{NAME}.html"; + + $state->{HTMLFILE} =~ s/[:\t\n ]/_/g; + + open(TEST, ">$self->{dirname}/$state->{HTMLFILE}"); + + print TEST "\n"; + print TEST "\n"; +} + +sub output_msg($$$) +{ + my ($self, $state, $output) = @_; + + unless (defined($self->{active_test})) { + print TEST "$output
"; + } else { + $self->{msg} .= "$output
"; + } +} + +sub end_testsuite($$$$$) +{ + my ($self, $state, $expected_ret, $ret, $envlog) = @_; + + print TEST "\n"; + print TEST "\n"; + + close(TEST); + + print {$self->{INDEX}} ""; + + if ($ret == $expected_ret) { + print {$self->{INDEX}} ""; + } else { + print {$self->{INDEX}} ""; + } + + print {$self->{INDEX}} "\n"; + + print {$self->{INDEX}} "\n"; +} + +sub start_test($$$) +{ + my ($self, $state, $testname) = @_; + + print TEST "

$testname

\n"; + + $self->{active_test} = $testname; + $self->{msg} = ""; +} + +sub end_test($$$$$) +{ + my ($self, $state, $testname, $result, $unexpected) = @_; + + if ($result eq "skip") { + print TEST "

\n"; + } elsif ($unexpected) { + print TEST "

\n"; + } + + print TEST $self->{msg}; + + print TEST "

\n"; + + $self->{active_test} = undef; +} + +sub summary($) +{ + my ($self) = @_; + print {$self->{INDEX}} "

Test	Environment	Result	Duration
{HTMLFILE}\">$state->{NAME}	$state->{ENVNAME}	OK	FAIL	" . (time() - $state->{START_TIME}) . "

\n"; + print {$self->{INDEX}} "FAILED ($self->{statistics}->{TESTS_UNEXPECTED_FAIL} failures and $self->{statistics}->{TESTS_ERROR} errors in $self->{statistics}->{SUITES_FAIL} testsuites)\n"; + + print {$self->{INDEX}} "\n"; + print {$self->{INDEX}} "\n"; +} + +sub missing_env($$$) +{ + my ($self, $name, $envname) = @_; + + print "FAIL: $name (ENV[$envname] not available!)\n"; +} + +sub skip_testsuite($$) +{ + my ($self, $name) = @_; + + print {$self->{INDEX}} "$nameN/ASKIPPEDN/A\n"; +} + +1; diff --git a/source/selftest/output/plain.pm b/source/selftest/output/plain.pm index 05a8bcce18e..d3ffe228a7f 100644 --- a/source/selftest/output/plain.pm +++ b/source/selftest/output/plain.pm @@ -98,4 +98,11 @@ sub missing_env($$$) print "FAIL: $name (ENV[$envname] not available!)\n"; } +sub skip_testsuite($$) +{ + my ($self, $name) = @_; + + print "SKIPPED: $name\n"; +} + 1; diff --git a/source/selftest/selftest.pl b/source/selftest/selftest.pl index 72fad8f2d02..1dbb494edbc 100755 --- a/source/selftest/selftest.pl +++ b/source/selftest/selftest.pl @@ -136,6 +136,7 @@ my $opt_analyse_cmd = undef; my $opt_resetup_env = undef; my $opt_bindir = undef; my $opt_no_lazy_setup = undef; +my $opt_format = "plain"; my $srcdir = "."; my $builddir = "."; @@ -239,7 +240,6 @@ sub parse_subunit_results($$$$) $msg_ops->end_test($msg_state, $2, $1, 0); $expected_ret = 0; } else { - print "n:$msg_state->{NAME}/$2\n"; $statistics->{TESTS_UNEXPECTED_FAIL}++; $msg_ops->end_test($msg_state, $2, $1, 1); } @@ -285,7 +285,7 @@ sub run_test($$$$$$) my $ret = close(RESULT); - cleanup_pcap($msg_state, $expected_ret, $ret); + cleanup_pcap($msg_state, $expected_ret, $ret); $msg_ops->end_testsuite($msg_state, $expected_ret, $ret, getlog_env($msg_state->{ENVNAME})); @@ -366,6 +366,7 @@ my $result = GetOptions ( 'no-lazy-setup' => \$opt_no_lazy_setup, 'resetup-environment' => \$opt_resetup_env, 'bindir:s' => \$opt_bindir, + 'format=s' => \$opt_format, ); exit(1) if (not $result); @@ -418,8 +419,10 @@ $ENV{SRCDIR} = $srcdir; $ENV{SRCDIR_ABS} = $srcdir_abs; my $tls_enabled = not $opt_quick; -my $from_build_farm = (defined($ENV{RUN_FROM_BUILD_FARM}) and - ($ENV{RUN_FROM_BUILD_FARM} eq "yes")); +if (defined($ENV{RUN_FROM_BUILD_FARM}) and + ($ENV{RUN_FROM_BUILD_FARM} eq "yes")) { + $opt_format = "buildfarm"; +} $ENV{TLS_ENABLED} = ($tls_enabled?"yes":"no"); $ENV{LD_LDB_MODULE_PATH} = "$old_pwd/bin/modules/ldb"; @@ -551,7 +554,7 @@ 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, "--option=torture:progress=no") if ($from_build_farm); +push (@torture_options, "--option=torture:progress=no") if ($opt_format eq "buildfarm"); push (@torture_options, "--format=subunit"); push (@torture_options, "--option=torture:quick=yes") if ($opt_quick); @@ -692,12 +695,18 @@ sub teardown_env($) } my $msg_ops; -if ($from_build_farm) { +if ($opt_format eq "buildfarm") { require output::buildfarm; $msg_ops = new output::buildfarm(); -} else { +} elsif ($opt_format eq "plain") { require output::plain; $msg_ops = new output::plain($opt_verbose, $opt_immediate, $statistics); +} elsif ($opt_format eq "html") { + require output::html; + mkdir "test-results"; + $msg_ops = new output::html("test-results", $statistics); +} else { + die("Invalid output format '$opt_format'"); } if ($opt_no_lazy_setup) { @@ -737,7 +746,7 @@ $envvarstr my $envname = $$_[1]; if (skip($name)) { - print "SKIPPED: $name\n"; + $msg_ops->skip_testsuite($name); $statistics->{SUITES_SKIPPED}++; next; } @@ -791,7 +800,7 @@ foreach (<$prefix/valgrind.log*>) { } } -if ($from_build_farm) { +if ($opt_format eq "buildfarm") { print "TEST STATUS: $numfailed\n"; } -- 2.34.1