diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-09-02 00:24:38 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 15:03:26 -0500 |
| commit | 0271566a5b3211735faad67e37e2d0474996b710 (patch) | |
| tree | 9c65ea212293a2ae790da0af237e9006bb38028e /source4/selftest/output | |
| parent | bf4f1307ab8a6c29b70f6ccf0cf4e34fa3629819 (diff) | |
| download | samba-0271566a5b3211735faad67e37e2d0474996b710.tar.gz samba-0271566a5b3211735faad67e37e2d0474996b710.tar.bz2 samba-0271566a5b3211735faad67e37e2d0474996b710.zip | |
r24878: Support specifying a reason for skips/expected failures
(This used to be commit 84c94b37fed837c7a45f59746de80d20063d93e8)
Diffstat (limited to 'source4/selftest/output')
| -rw-r--r-- | source4/selftest/output/buildfarm.pm | 10 | ||||
| -rw-r--r-- | source4/selftest/output/html.pm | 10 | ||||
| -rw-r--r-- | source4/selftest/output/plain.pm | 8 |
3 files changed, 20 insertions, 8 deletions
diff --git a/source4/selftest/output/buildfarm.pm b/source4/selftest/output/buildfarm.pm index d35fe9f250..97c2ec0c40 100644 --- a/source4/selftest/output/buildfarm.pm +++ b/source4/selftest/output/buildfarm.pm @@ -99,11 +99,15 @@ sub missing_env($$$) print "FAIL: $name (ENV[$envname] not available!)\n"; } -sub skip_testsuite($$$) +sub skip_testsuite($$$$) { - my ($self, $envname, $name) = @_; + my ($self, $envname, $name, $reason) = @_; - print "SKIPPED: $name\n"; + if ($reason) { + print "SKIPPED: $name [$reason]\n"; + } else { + print "SKIPPED: $name\n"; + } } 1; diff --git a/source4/selftest/output/html.pm b/source4/selftest/output/html.pm index 44846dc9dd..2a2a12b63d 100644 --- a/source4/selftest/output/html.pm +++ b/source4/selftest/output/html.pm @@ -315,14 +315,18 @@ sub missing_env($$$) print INDEX "</tr>\n"; } -sub skip_testsuite($$$) +sub skip_testsuite($$$$) { - my ($self, $envname, $name) = @_; + my ($self, $envname, $name, $reason) = @_; print INDEX "<tr>\n"; print INDEX " <td class=\"testSuite\">$name</td>\n"; print INDEX " <td class=\"environment\">$envname</td>\n"; - print INDEX " <td class=\"resultSkipped\">SKIPPED</td>\n"; + if ($reason) { + print INDEX " <td class=\"resultSkipped\">SKIPPED - $reason</td>\n"; + } else { + print INDEX " <td class=\"resultSkipped\">SKIPPED</td>\n"; + } print INDEX "</tr>\n"; } diff --git a/source4/selftest/output/plain.pm b/source4/selftest/output/plain.pm index 736a138b07..bbf0f8f414 100644 --- a/source4/selftest/output/plain.pm +++ b/source4/selftest/output/plain.pm @@ -113,9 +113,13 @@ sub missing_env($$$) sub skip_testsuite($$$) { - my ($self, $envname, $name) = @_; + my ($self, $envname, $name, $reason) = @_; - print "SKIPPED: $name\n"; + if ($reason) { + print "SKIPPED: $name [$reason]\n"; + } else { + print "SKIPPED: $name\n"; + } } 1; |