Author: jelmer Date: 2007-08-31 13:24:59 +0000 (Fri, 31 Aug 2007) New Revision: 24834
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=24834 Log: Pass environment name on to skip_testsuite(). Modified: branches/SAMBA_4_0/ branches/SAMBA_4_0/source/selftest/output/buildfarm.pm branches/SAMBA_4_0/source/selftest/output/html.pm branches/SAMBA_4_0/source/selftest/output/plain.pm branches/SAMBA_4_0/source/selftest/selftest.pl Changeset: Property changes on: branches/SAMBA_4_0 ___________________________________________________________________ Name: bzr:revision-info ...skipped... Name: bzr:revision-id:v3-trunk0 ...skipped... Modified: branches/SAMBA_4_0/source/selftest/output/buildfarm.pm =================================================================== --- branches/SAMBA_4_0/source/selftest/output/buildfarm.pm 2007-08-31 12:21:18 UTC (rev 24833) +++ branches/SAMBA_4_0/source/selftest/output/buildfarm.pm 2007-08-31 13:24:59 UTC (rev 24834) @@ -99,9 +99,9 @@ print "FAIL: $name (ENV[$envname] not available!)\n"; } -sub skip_testsuite($$) +sub skip_testsuite($$$) { - my ($self, $name) = @_; + my ($self, $envname, $name) = @_; print "SKIPPED: $name\n"; } Modified: branches/SAMBA_4_0/source/selftest/output/html.pm =================================================================== --- branches/SAMBA_4_0/source/selftest/output/html.pm 2007-08-31 12:21:18 UTC (rev 24833) +++ branches/SAMBA_4_0/source/selftest/output/html.pm 2007-08-31 13:24:59 UTC (rev 24834) @@ -312,13 +312,14 @@ print INDEX "</tr>\n"; } -sub skip_testsuite($$) +sub skip_testsuite($$$) { - my ($self, $name) = @_; + my ($self, $envname, $name) = @_; print INDEX "<tr>\n"; print INDEX " <td class=\"testSuite\">$name</td>\n"; - print INDEX " <td class=\"resultSkipped\" colspan=\"2\">SKIPPED</td>\n"; + print INDEX " <td class=\"environment\">$envname</td>\n"; + print INDEX " <td class=\"resultSkipped\">SKIPPED</td>\n"; print INDEX "</tr>\n"; } Modified: branches/SAMBA_4_0/source/selftest/output/plain.pm =================================================================== --- branches/SAMBA_4_0/source/selftest/output/plain.pm 2007-08-31 12:21:18 UTC (rev 24833) +++ branches/SAMBA_4_0/source/selftest/output/plain.pm 2007-08-31 13:24:59 UTC (rev 24834) @@ -111,9 +111,9 @@ print "FAIL: $name (ENV[$envname] not available!)\n"; } -sub skip_testsuite($$) +sub skip_testsuite($$$) { - my ($self, $name) = @_; + my ($self, $envname, $name) = @_; print "SKIPPED: $name\n"; } Modified: branches/SAMBA_4_0/source/selftest/selftest.pl =================================================================== --- branches/SAMBA_4_0/source/selftest/selftest.pl 2007-08-31 12:21:18 UTC (rev 24833) +++ branches/SAMBA_4_0/source/selftest/selftest.pl 2007-08-31 13:24:59 UTC (rev 24834) @@ -697,7 +697,7 @@ my $envname = $$_[1]; if (skip($name)) { - $msg_ops->skip_testsuite($name); + $msg_ops->skip_testsuite($envname, $name); $statistics->{SUITES_SKIPPED}++; next; }
