core: Apply the same treatment to the in errno message in __igt_fail_assert()

Just like the it was done for the requirement message, display the errno
message only if errno is set, and display it at the end of the assert
message.

Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>

diff --git a/lib/igt_core.c b/lib/igt_core.c
index 03c1f61..bdeeb59 100644 (file)
--- a/lib/igt_core.c
+++ b/lib/igt_core.c
@@ -678,11 +678,17 @@ void __igt_fail_assert(int exitcode, const char *file,
 {
        va_list args;
        int err = errno;
+       char *err_str = NULL;
+
+       if (err)
+               asprintf(&err_str, "Last errno: %i, %s\n", err, strerror(err));
 
        printf("Test assertion failure function %s, file %s:%i:\n"
-              "Last errno: %i, %s\n"
-              "Failed assertion: %s\n",
-              func, file, line, err, strerror(err), assertion);
+              "Failed assertion: %s\n"
+              "%s",
+              func, file, line, assertion, err_str ?: "");
+
+       free(err_str);
 
        if (f) {
                va_start(args, f);