tst_res: Print errno number in addition to error name
Occasionally new error numbers are added to the kernel (maybe by
accident). Currently if we do not know the name of them then we just print
???.
This commit simply always prints the error number to aid with debugging.
Signed-off-by: Richard Palethorpe <rpalethorpe@suse.com>
Acked-by: Li Wang <liwang@redhat.com>
Acked-by: Cyril Hrubis <chrubis@suse.cz>
diff --git a/lib/tst_test.c b/lib/tst_test.c
index 39f2614..d2cf926 100644
--- a/lib/tst_test.c
+++ b/lib/tst_test.c
@@ -177,7 +177,7 @@
{
char buf[1024];
char *str = buf;
- int ret, size = sizeof(buf), ssize;
+ int ret, size = sizeof(buf), ssize, int_errno;
const char *str_errno = NULL;
const char *res;
@@ -205,15 +205,19 @@
abort();
}
- if (ttype & TERRNO)
+ if (ttype & TERRNO) {
str_errno = tst_strerrno(errno);
+ int_errno = errno;
+ }
- if (ttype & TTERRNO)
+ if (ttype & TTERRNO) {
str_errno = tst_strerrno(TST_ERR);
+ int_errno = TST_ERR;
+ }
if (ttype & TRERRNO) {
- ret = TST_RET < 0 ? -(int)TST_RET : (int)TST_RET;
- str_errno = tst_strerrno(ret);
+ int_errno = TST_RET < 0 ? -(int)TST_RET : (int)TST_RET;
+ str_errno = tst_strerrno(int_errno);
}
ret = snprintf(str, size, "%s:%i: ", file, lineno);
@@ -237,7 +241,7 @@
"Next message is too long and truncated:");
} else if (str_errno) {
ssize = size - 2;
- ret = snprintf(str, size, ": %s", str_errno);
+ ret = snprintf(str, size, ": %s (%d)", str_errno, int_errno);
str += MIN(ret, ssize);
size -= MIN(ret, ssize);
if (ret >= ssize)
