summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorEd Santiago <santiago@redhat.com>2020-04-08 12:10:24 -0600
committerEd Santiago <santiago@redhat.com>2020-04-08 12:10:24 -0600
commit55eea9127a845e2a7f3db04f0c7a10ae5b3ef0f6 (patch)
tree3e20af2edfaf0fd6d65c223c62a8ef15b97cbae5 /contrib
parent291ad7fbd9797340015b71b448c6637669176878 (diff)
downloadpodman-55eea9127a845e2a7f3db04f0c7a10ae5b3ef0f6.tar.gz
podman-55eea9127a845e2a7f3db04f0c7a10ae5b3ef0f6.tar.bz2
podman-55eea9127a845e2a7f3db04f0c7a10ae5b3ef0f6.zip
logformat: handle apiv2 results, add anchor links
apiv2 tests emit TAP-compliant output; recognize it and highlight it the same way we do BATS tests. Add anchor links to TAP output, so other tools (e.g. cirrus-flake-summarize) can link to particular lines And, remove a "-f" from "wait" in test-apiv2; looks like there's some version of bash used in some CI VM that doesn't grok it. Signed-off-by: Ed Santiago <santiago@redhat.com>
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/cirrus/logformatter8
1 files changed, 6 insertions, 2 deletions
diff --git a/contrib/cirrus/logformatter b/contrib/cirrus/logformatter
index 6a86f6a49..738d2e19d 100755
--- a/contrib/cirrus/logformatter
+++ b/contrib/cirrus/logformatter
@@ -220,8 +220,8 @@ END_HTML
$cirrus_task = $1;
}
- # BATS handling
- if ($line =~ /^1\.\.\d+$/) {
+ # BATS handling (used also for apiv2 tests, which emit TAP output)
+ if ($line =~ /^1\.\.\d+$/ || $line =~ m!/test-apiv2!) {
$looks_like_bats = 1;
}
if ($looks_like_bats) {
@@ -234,6 +234,10 @@ END_HTML
elsif ($line =~ /^#\s/) { $css = 'log' }
if ($css) {
+ # Make it linkable, e.g. foo.html#t--00001
+ if ($line =~ /^(not\s+)?ok\s+(\d+)/) {
+ $line = sprintf("<a name='t--%05d'>%s</a>", $2, $line);
+ }
$line = "<span class='bats-$css'>$line</span>";
}