From 997bac87b12547ace3650a212667222bcbfb9bf3 Mon Sep 17 00:00:00 2001
From: Kamil Konieczny <kamil.konieczny@linux.intel.com>
Date: Fri, 23 Aug 2024 18:14:09 +0200
Subject: [PATCH] runner/settings: set PRUNE_KEEP_ALL as default
In testing drm-tip it is helpful to have reported all tests
results, especially when one have many dynamic ones we want
to get a parent result.
v2: fix for runner_tests (Jari)
Cc: Ewelina Musial <ewelina.musial@intel.com>
Cc: Helen Koike <helen.koike@collabora.com>
Cc: Jari Tahvanainen <jari.tahvanainen@intel.com>
Cc: Petri Latvala <adrinael@adrinael.net>
Cc: Rob Clark <robdclark@gmail.com>
Signed-off-by: Kamil Konieczny <kamil.konieczny@linux.intel.com>
Reviewed-by: Peter Senna Tschudin <peter.senna@intel.com>
Tested-by: Jari Tahvanainen <jari.tahvanainen@intel.com>
---
runner/runner_tests.c | 2 +-
runner/settings.c | 8 ++++++--
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/runner/runner_tests.c b/runner/runner_tests.c
index b806d45ad..a661722ac 100644
--- a/runner/runner_tests.c
+++ b/runner/runner_tests.c
@@ -310,7 +310,7 @@ igt_main
igt_assert_eq(settings->per_test_timeout, 0);
igt_assert_eq(settings->overall_timeout, 0);
igt_assert(!settings->use_watchdog);
- igt_assert_eq(settings->prune_mode, 0);
+ igt_assert_eq(settings->prune_mode, PRUNE_KEEP_ALL);
igt_assert(strstr(settings->test_root, "test-root-dir") != NULL);
igt_assert(strstr(settings->results_path, "path-to-results") != NULL);
diff --git a/runner/settings.c b/runner/settings.c
index 94b3b9fe6..0d27e7af3 100644
--- a/runner/settings.c
+++ b/runner/settings.c
@@ -279,11 +279,11 @@ static const char *usage_str =
" results that are removed from the final results set.\n"
" Possible options:\n"
" keep-dynamic-subtests - Remove subtests that have dynamic\n"
- " subtests. (default)\n"
+ " subtests.\n"
" keep-dynamic - Alias for the above\n"
" keep-subtests - Remove dynamic subtests,\n"
" leaving just the parent subtest.\n"
- " keep-all - Don't remove anything\n"
+ " keep-all - Don't remove anything (default)\n"
" keep-requested - Remove reported results that are\n"
" not in the requested test set.\n"
" Useful when you have a hand-written\n"
@@ -693,6 +693,7 @@ bool parse_options(int argc, char **argv,
optind = 1;
settings->dmesg_warn_level = -1;
+ settings->prune_mode = -1;
while ((c = getopt_long(argc, argv, "hn:dt:x:e:sl:omb:L",
long_options, NULL)) != -1) {
@@ -818,6 +819,9 @@ bool parse_options(int argc, char **argv,
if (settings->dmesg_warn_level < 0)
settings->dmesg_warn_level = 4; /* KERN_WARN */
+ if (settings->prune_mode < 0)
+ settings->prune_mode = PRUNE_KEEP_ALL;
+
if (settings->list_all) { /* --list-all doesn't require results path */
switch (argc - optind) {
case 1:
--
GitLab