Commit d71663c2 authored by Daiki Ueno's avatar Daiki Ueno Committed by Daiki Ueno
Browse files

build: Drop TAP wrapper script around GLib tests

The GLib versions we require supports TAP natively when tests are run
with the --tap option.
parent 4d39dd13
# This can also be run with Python 2.
#! /bin/sh
# Copyright (C) 2014 Red Hat, Inc.
# Cockpit is free software; you can redistribute it and/or modify it
# under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation; either version 2.1 of the License, or
# (at your option) any later version.
# Cockpit is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# Lesser General Public License for more details.
# You should have received a copy of the GNU Lesser General Public License
# along with Cockpit; If not, see <>.
# run a GTest in tap mode. The test binary is passed as $1
# This is a test output compiler which produces TAP from GTest output
# if GTest output is detected.
# Versions of glib later than 2.38.x output TAP natively when tests are
# run with the --tap option. However we can't depend on such a recent
# version of glib for our purposes.
# This implements the Test Anything Protocol (ie: TAP)
import argparse
import os
import select
import signal
import subprocess
import sys
# Yes, it's dumb, but strsignal is not exposed in python
# In addition signal numbers varify heavily from arch to arch
def strsignal(sig):
for name in dir(signal):
if name.startswith("SIG") and sig == getattr(signal, name):
return name
return str(sig)
class NullCompiler:
def __init__(self, command):
self.command = command
def input(self, line):
def process(self, proc):
while True:
line = proc.stdout.readline()
if not line:
return proc.returncode
def run(self, proc, line=None):
if line:
return self.process(proc)
class GTestCompiler(NullCompiler):
def __init__(self, filename):
NullCompiler.__init__(self, filename)
self.test_num = 0
self.test_name = None
self.test_remaining = []
def input(self, line):
line = line.strip()
if line.startswith("GTest: "):
(cmd, unused, data) = line[7:].partition(": ")
cmd = cmd.strip()
data = data.strip()
if cmd == "run":
self.test_name = data
assert self.test_name in self.test_remaining, "%s %s" % (self.test_name, repr(self.test_remaining))
self.test_num += 1
elif cmd == "result":
if self.test_name:
if data == "OK":
print("ok %d %s" % (self.test_num, self.test_name))
if data == "FAIL":
print("not ok %d %s" % (self.test_num, self.test_name))
if data == "SKIP":
print("ok %d %s # skip" % (self.test_num, self.test_name))
self.test_name = None
elif cmd == "skipping":
if "/subprocess" not in data:
print("ok %d # skip -- %s" % (self.test_num, data))
self.test_name = None
elif data:
print("# %s: %s" % (cmd, data))
print("# %s" % cmd)
elif line.startswith("(MSG: "):
print("# %s" % line[6:-1])
elif line:
print("# %s" % line)
def run(self, proc, output=""):
# Complete retrieval of the list of tests
output +=
if proc.returncode:
sys.stderr.write("tap-gtester: listing GTest tests failed: %d\n" % proc.returncode)
return proc.returncode
self.test_remaining = []
for line in output.split("\n"):
if line.startswith("/"):
if not self.test_remaining:
print("Bail out! No tests found in GTest: %s" % self.command[0])
return 0
print("1..%d" % len(self.test_remaining))
# First try to run all the tests in a batch
proc = subprocess.Popen(self.command + ["--verbose" ], close_fds=True,
stdout=subprocess.PIPE, universal_newlines=True)
result = self.process(proc)
if result == 0:
return 0
if result < 0:
sys.stderr.write("%s terminated with %s\n" % (self.command[0], strsignal(-result)))
# Now pick up any stragglers due to failures
while True:
# Assume that the last test failed
if self.test_name:
print("not ok %d %s" % (self.test_num, self.test_name))
self.test_name = None
# Run any tests which didn't get run
if not self.test_remaining:
proc = subprocess.Popen(self.command + ["--verbose", "-p", self.test_remaining[0]],
close_fds=True, stdout=subprocess.PIPE,
result = self.process(proc)
# The various exit codes and signals we continue for
if result not in [ 0, 1, -4, -5, -6, -7, -8, -11, 33 ]:
return result
def main(argv):
parser = argparse.ArgumentParser(description='Automake TAP compiler',
usage="tap-gtester [--format FORMAT] command ...")
parser.add_argument('--format', metavar='FORMAT', choices=[ "auto", "gtest", "tap" ],
default="auto", help='The input format to compile')
parser.add_argument('--verbose', action='store_true',
default=True, help='Verbose mode (ignored)')
parser.add_argument('command', nargs=argparse.REMAINDER, help="A test command to run")
args = parser.parse_args(argv[1:])
output = None
format = args.format
cmd = args.command
if not cmd:
sys.stderr.write("tap-gtester: specify a command to run\n")
return 2
if cmd[0] == '--':
proc = None
os.environ['HARNESS_ACTIVE'] = '1'
if format in ["auto", "gtest"]:
list_cmd = cmd + ["-l", "--verbose"]
proc = subprocess.Popen(list_cmd, close_fds=True, stdout=subprocess.PIPE,
output = proc.stdout.readline()
# Smell whether we're dealing with GTest list output from first line
if "random seed" in output or "GTest" in output or output.startswith("/"):
format = "gtest"
format = "tap"
proc = subprocess.Popen(cmd, close_fds=True, stdout=subprocess.PIPE,
if format == "gtest":
compiler = GTestCompiler(cmd)
elif format == "tap":
compiler = NullCompiler(cmd)
assert False, "not reached"
return, output)
if __name__ == "__main__":
$1 -k --tap
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment