tests: print error locations verbosely

So we don't have to figure out which line generated this error by
searching for the subtest/error code combination.

Change-Id: Icca0a776fd19f0f3d250ddb76916f5f932dd9b5e

diff --git a/test/common.c b/test/common.c
index 7807d79da6b19caf318ebf96a44205baa2100b35..40b2fccc6f1fd614ccb51b018b1dff5689cad078 100644 (file)
--- a/test/common.c
+++ b/test/common.c
@@ -12,9 +12,11 @@
 
 int common_test_nr = -1, errct = 0, subtest;
 
+#define e(errn) e_f(__FILE__, __LINE__, (errn))
+
 void cleanup(void);
 int does_fs_truncate(void);
-void e(int n);
+void e_f(char *file, int lineno, int n);
 int name_max(char *path);
 void quit(void);
 void rm_rf_dir(int test_nr);
@@ -98,14 +100,13 @@ int test_nr;
   if (system(buf) != 0) printf("Warning: system(\"%s\") failed\n", buf);
 }
 
-void e(n)
-int n;
+void e_f(char *file, int line, int n)
 {
   int err_number;
   err_number = errno;  /* Store before printf can clobber it */
   if (errct == 0) printf("\n");        /* finish header */
-  printf("Subtest %d,  error %d,  errno %d: %s\n",
-        subtest, n, errno, strerror(errno));
+  printf("%s:%d: Subtest %d,  error %d,  errno %d: %s\n",
+       file, line, subtest, n, errno, strerror(errno));
   if (++errct > MAX_ERROR) {
        printf("Too many errors; test aborted\n");
        cleanup();

diff --git a/test/test14.c b/test/test14.c
index 1765239af7c8aa982b31453a0a5ebb3b4293b919..479fdb2502cdc840d96c6878b35f65a1bdb90334 100644 (file)
--- a/test/test14.c
+++ b/test/test14.c
@@ -16,7 +16,6 @@ int subtest = 1;
 #include "common.c"
 
 int main(void);
-void e(int n);
 void quit(void);
 
 int main()

diff --git a/test/test22.c b/test/test22.c
index 3bdc0c8c235960fdafe8d07fc438f25bee7dcd26..bdefc73a45dc47c981eef8ccd784ae6e3e52243c 100644 (file)
--- a/test/test22.c
+++ b/test/test22.c
@@ -21,7 +21,6 @@
 void test22a(void);
 int mode(char *filename);
 int umode(char *filename);
-void e(int number);
 void quit(void);
 
 int main(int argc, char *argv[])

diff --git a/test/test3.c b/test/test3.c
index 84c83ec44eb169478916ec8eb236dc2010b6cf3f..5490b3b9ef764de3e7f46743da617f039dafd8a8 100644 (file)
--- a/test/test3.c
+++ b/test/test3.c
@@ -25,7 +25,6 @@ void test3a(void);
 void test3c(void);
 void test3d(void);
 void test3e(void);
-void e(int n);
 
 int main(argc, argv)
 int argc;