Skip to contentSkip to conversation

lib: add subtest start and exit status code messages to debug output

PATCH New Thomas Wood 1 participant 2 messages Jan 27, 2015 Library code

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 lib: add subtest start and exit status code messages to debug output

---
 lib/igt_core.c | 2 ++
 1 file changed, 2 insertions(+)
lib/igt_core.c +2 -0
index d74f6f8..41f84bb 100644
@@ -729,6 +729,7 @@ bool __igt_run_subtest(const char *subtest_name)
 	}
 
 	kmsg(KERN_INFO "%s: starting subtest %s\n", command_str, subtest_name);
+	igt_debug("Starting subtest: %s\n", subtest_name);
 
 	gettime(&subtest_time);
 	return (in_subtest = subtest_name);
@@ -972,6 +973,7 @@ void igt_exit(void)
 		exit(IGT_EXIT_SUCCESS);
 
 	kmsg(KERN_INFO "%s: exiting, ret=%d\n", command_str, igt_exitcode);
+	igt_debug("Exiting with status code %d\n", igt_exitcode);
 
 	if (!test_with_subtests)
 		exit(igt_exitcode);
Signature · 6 lines
2.1.0

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw

PATCH 2/2 lib: add exit status message to simple tests

Add an exit status message to simple tests, similar to the one printed for subtests. This includes the test outcome and the time taken to run the test.

---
 lib/igt_core.c | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)
lib/igt_core.c +29 -1
index 41f84bb..0ae6918 100644
@@ -591,6 +591,9 @@ out:
 	/* install exit handler, to ensure we clean up */
 	igt_install_exit_handler(common_exit_handler);
 
+	if (!test_with_subtests)
+		gettime(&subtest_time);
+
 	return ret;
 }
 
@@ -975,8 +978,33 @@ void igt_exit(void)
 	kmsg(KERN_INFO "%s: exiting, ret=%d\n", command_str, igt_exitcode);
 	igt_debug("Exiting with status code %d\n", igt_exitcode);
 
-	if (!test_with_subtests)
+	if (!test_with_subtests) {
+		struct timespec now;
+		double elapsed;
+		const char *result;
+
+		gettime(&now);
+		elapsed = now.tv_sec - subtest_time.tv_sec;
+		elapsed += (now.tv_nsec - subtest_time.tv_nsec) * 1e-9;
+
+		switch (igt_exitcode) {
+			case IGT_EXIT_SUCCESS:
+				result = "SUCCESS";
+				break;
+			case IGT_EXIT_TIMEOUT:
+				result = "TIMEOUT";
+				break;
+			case IGT_EXIT_SKIP:
+				result = "SKIP";
+				break;
+			default:
+				result = "FAIL";
+		}
+
+
+		printf("%s (%.3fs)\n", result, elapsed);
 		exit(igt_exitcode);
+	}
 
 	/* Calling this without calling one of the above is a failure */
 	assert(skipped_one || succeeded_one || failed_one);
Signature · 6 lines
2.1.0

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx