All of lore.kernel.org
 help / color / mirror / Atom feed
* [igt-dev] [PATCH i-g-t 1/1] runner: Add "root" also to the "totals" object
@ 2018-10-19  8:46 Petri Latvala
  2018-10-19 12:01 ` Andi Shyti
                   ` (4 more replies)
  0 siblings, 5 replies; 6+ messages in thread
From: Petri Latvala @ 2018-10-19  8:46 UTC (permalink / raw)
  To: igt-dev; +Cc: Andi Shyti, Petri Latvala

Turns out the same information is looked up in different places in
different code paths. Piglit's summary module looks up total counts in
['totals']['root'], CI looks up ['totals']['']. The latter is
inherited from piglit, so this has probably changed at some point.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=108486
Signed-off-by: Petri Latvala <petri.latvala@intel.com>
Cc: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
Cc: Andi Shyti <andi.shyti@intel.com>
---
 runner/resultgen.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/runner/resultgen.c b/runner/resultgen.c
index ed8c9266..e059c65b 100644
--- a/runner/resultgen.c
+++ b/runner/resultgen.c
@@ -906,13 +906,14 @@ static void add_to_totals(char *binary,
 			  struct subtests *subtests,
 			  struct results *results)
 {
-	struct json_object *test, *resultobj, *roottotal, *binarytotal;
+	struct json_object *test, *resultobj, *emptystrtotal, *roottotal, *binarytotal;
 	char piglit_name[256];
 	const char *result;
 	size_t i;
 
 	generate_piglit_name(binary, NULL, piglit_name, sizeof(piglit_name));
-	roottotal = get_totals_object(results->totals, "");
+	emptystrtotal = get_totals_object(results->totals, "");
+	roottotal = get_totals_object(results->totals, "root");
 	binarytotal = get_totals_object(results->totals, piglit_name);
 
 	if (subtests->size == 0) {
@@ -922,6 +923,7 @@ static void add_to_totals(char *binary,
 			return;
 		}
 		result = json_object_get_string(resultobj);
+		add_result_to_totals(emptystrtotal, result);
 		add_result_to_totals(roottotal, result);
 		add_result_to_totals(binarytotal, result);
 		return;
@@ -935,6 +937,7 @@ static void add_to_totals(char *binary,
 			return;
 		}
 		result = json_object_get_string(resultobj);
+		add_result_to_totals(emptystrtotal, result);
 		add_result_to_totals(roottotal, result);
 		add_result_to_totals(binarytotal, result);
 	}
-- 
2.18.0

_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

^ permalink raw reply related	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2018-10-23  5:27 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-10-19  8:46 [igt-dev] [PATCH i-g-t 1/1] runner: Add "root" also to the "totals" object Petri Latvala
2018-10-19 12:01 ` Andi Shyti
2018-10-19 12:17 ` Arkadiusz Hiler
2018-10-22 18:48 ` [igt-dev] ✗ Fi.CI.BAT: failure for series starting with [i-g-t,1/1] " Patchwork
2018-10-23  4:38 ` [igt-dev] ✓ Fi.CI.BAT: success " Patchwork
2018-10-23  5:27 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.