fdo-mirrors/libinput
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libinput/libinput.git synced 2025-12-27 13:50:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

test: drop the --xml-prefix option

Browse source 
litest-runner outputs in YAML and no-one ever looks at the XML files
anyway. They are used to provide nice pipeline summaries but again,
no-one looks at those because they're not very useful.

Part-of: <https://gitlab.freedesktop.org/libinput/libinput/-/merge_requests/1067>
This commit is contained in:
Peter Hutterer 2024-10-21 12:08:00 +10:00 • committed by Marge Bot
parent c6ba3e2eb8
commit 1f8a4df58c
2 changed files with 2 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
meson.build
View file

@ -983,8 +983,7 @@ if get_option('tests')
test('libinput-test-suite-@0@'.format(group),
libinput_test_runner,
suite : ['all', 'valgrind', 'root', 'hardware'],
args : ['--filter-group=@0@'.format(group),
'--xml-output=junit-@0@-XXXXXX.xml'.format(group)],
args : ['--filter-group=@0@'.format(group)],
is_parallel : false,
timeout : 1200)
endforeach
@ -992,8 +991,7 @@ if get_option('tests')
test('libinput-test-deviceless',
libinput_test_runner,
suite : ['all', 'valgrind'],
args: ['--filter-deviceless',
'--xml-output=junit-deviceless-XXXXXX.xml'])
args: ['--filter-deviceless'])
valgrind = find_program('valgrind', required : false)
if valgrind.found()

74
test/litest.c
View file

@ -87,7 +87,6 @@ static const char *filter_test = NULL;
static const char *filter_device = NULL;
static const char *filter_group = NULL;
static int filter_rangeval = INT_MIN;
static const char *xml_prefix = NULL;
static struct quirks_context *quirks_context;
struct created_file {
@ -913,70 +912,6 @@ quirk_log_handler(struct libinput *unused,
vfprintf(stderr, format, args);
}
#if 0
static void
litest_export_xml(SRunner *sr, const char *xml_prefix)
{
TestResult **results;
int nresults, nfailed;
char *filename;
int fd;
/* This is the minimum-effort implementation here because its only
* real purpose is to make test logs look pretty in the gitlab CI.
*
* Which means:
* - there's no filename validation, if you supply a filename that
* mkstemps doesn't like, things go boom.
* - every fork writes out a separate junit.xml file. gitlab is better
* at collecting lots of files than I am at writing code to collect
* this across forks to write out only one file.
* - most of the content is pretty useless because libcheck only gives
* us minimal information. the libcheck XML file has more info like
* the duration of each test but it's more complicated to extract
* and we don't need it for now.
*/
filename = safe_strdup(xml_prefix);
fd = mkstemps(filename, 4);
results = srunner_results(sr);
nresults = srunner_ntests_run(sr);
nfailed = srunner_ntests_failed(sr);
dprintf(fd, "<?xml version=\"1.0\"?>\n");
dprintf(fd, "<testsuites id=\"%s\" tests=\"%d\" failures=\"%d\">\n",
filename,
nresults,
nfailed);
dprintf(fd, " <testsuite>\n");
for (int i = 0; i < nresults; i++) {
TestResult *r = results[i];
dprintf(fd, " <testcase id=\"%s\" name=\"%s\" %s>\n",
tr_tcname(r),
tr_tcname(r),
tr_rtype(r) == CK_PASS ? "/" : "");
if (tr_rtype(r) != CK_PASS) {
dprintf(fd, " <failure message=\"%s:%d\">\n",
tr_lfile(r),
tr_lno(r));
dprintf(fd, " %s:%d\n", tr_lfile(r), tr_lno(r));
dprintf(fd, " %s\n", tr_tcname(r));
dprintf(fd, "\n");
dprintf(fd, " %s\n", tr_msg(r));
dprintf(fd, " </failure>\n");
dprintf(fd, " </testcase>\n");
}
}
dprintf(fd, " </testsuite>\n");
dprintf(fd, "</testsuites>\n");
free(results);
close(fd);
free(filename);
}
#endif
static enum litest_runner_result
init_quirks(void *userdata)
{
@ -4585,7 +4520,6 @@ litest_parse_argv(int argc, char **argv)
OPT_FILTER_GROUP,
OPT_FILTER_RANGEVAL,
OPT_FILTER_DEVICELESS,
OPT_XML_PREFIX,
OPT_JOBS,
OPT_LIST,
OPT_VERBOSE,
@ -4597,7 +4531,6 @@ litest_parse_argv(int argc, char **argv)
{ "filter-rangeval", 1, 0, OPT_FILTER_RANGEVAL },
{ "filter-deviceless", 0, 0, OPT_FILTER_DEVICELESS },
{ "exitfirst", 0, 0, OPT_EXIT_FIRST },
{ "xml-output", 1, 0, OPT_XML_PREFIX },
{ "jobs", 1, 0, OPT_JOBS },
{ "list", 0, 0, OPT_LIST },
{ "verbose", 0, 0, OPT_VERBOSE },
@ -4654,10 +4587,6 @@ litest_parse_argv(int argc, char **argv)
" Only run tests with the given range value\n"
" --filter-deviceless=.... \n"
" Glob to filter on tests that do not create test devices\n"
" --xml-output=/path/to/file-XXXXXXX.xml\n"
" Write test output in libcheck's XML format\n"
" to the given files. The file must match the format\n"
" prefix-XXXXXX.xml and only the prefix is your choice.\n"
" --verbose\n"
" Enable verbose output\n"
" --jobs 8\n"
@ -4686,9 +4615,6 @@ litest_parse_argv(int argc, char **argv)
case OPT_FILTER_RANGEVAL:
filter_rangeval = atoi(optarg);
break;
case OPT_XML_PREFIX:
xml_prefix = optarg;
break;
case 'j':
case OPT_JOBS:
jobs = atoi(optarg);