summaryrefslogtreecommitdiff
path: root/runner
diff options
context:
space:
mode:
authorPetri Latvala <petri.latvala@intel.com>2018-09-11 14:38:52 +0300
committerPetri Latvala <petri.latvala@intel.com>2018-09-12 10:08:31 +0300
commitd07fb7a19b8b78a2c8d75e0f99939bd477219213 (patch)
treed7d93015ffb401ae0e076d48798652cc64f9ff63 /runner
parentc7fa2ea9fbce87206474748100b825558eebe08e (diff)
runner/resultgen: More checking if subtests should exist
If a test with subtests just exits immediately, or the test binary doesn't exist at all (as is sometimes the case with kms_chamelium), the existence of subtests doesn't end up in the execution journal. As was done for timeouts in a797cbf6918a ("runner/resultgen: Be more robust with incomplete tests"), check if we were attempting to run a subtest before attributing a 'notrun' result to an incorrect field. Signed-off-by: Petri Latvala <petri.latvala@intel.com> Cc: Arkadiusz Hiler <arkadiusz.hiler@intel.com> Cc: Martin Peres <martin.peres@linux.intel.com> Reviewed-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
Diffstat (limited to 'runner')
-rw-r--r--runner/resultgen.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/runner/resultgen.c b/runner/resultgen.c
index ea680914..d939583d 100644
--- a/runner/resultgen.c
+++ b/runner/resultgen.c
@@ -778,7 +778,7 @@ static void fill_from_journal(int fd,
add_runtime(obj, time);
/* If no subtests, the test result node also gets the runtime */
- if (subtests->size == 0) {
+ if (subtests->size == 0 && entry->subtest_count == 0) {
obj = get_or_create_json_object(tests, piglit_name);
add_runtime(obj, time);
}