Changeset 1575

Timestamp:

04/23/10 14:12:51 (3 years ago)

Author:

perry

Message:

Be clearer with what failed

File:

• trunk/test/test-format.c (modified) (6 diffs)

trunk/test/test-format.c

@@ -49 +49 @@
 #include "libtrace.h"
 
-void iferr(libtrace_t *trace)
+void iferr(libtrace_t *trace,const char *msg)
 {
         libtrace_err_t err = trace_get_err(trace);
         if (err.err_num==0)
                 return;
-        printf("Error: %s\n",err.problem);
+        printf("Error: %s: %s\n", msg, err.problem);
         exit(1);
 }
@@ -90 +90 @@
         int level = 0;
         int expected = 100;
+        const char *tracename;
         libtrace_t *trace;
         libtrace_packet_t *packet;
@@ -98 +99 @@
         }
 
-        trace = trace_create(lookup_uri(argv[1]));
-        iferr(trace);
+        tracename = lookup_uri(argv[1]);
+
+        trace = trace_create(tracename);
+        iferr(trace,tracename);
 
         if (strcmp(argv[1],"rtclient")==0) expected=101;
@@ -106 +109 @@
 
         trace_start(trace);
-        iferr(trace);
+        iferr(trace,tracename);
         
         packet=trace_create_packet();
@@ -112 +115 @@
                 if ((psize = trace_read_packet(trace, packet)) <0) {
                         error = 1;
-                        iferr(trace);
+                        iferr(trace,tracename);
                         break;
                 }
@@ -135 +138 @@
                 }
         } else {
-                iferr(trace);
+                iferr(trace,tracename);
         }
         trace_destroy(trace);