Changeset ef5a9ab

Timestamp:

07/02/13 14:50:50 (8 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, getfragoff, help, libtrace4, master, ndag_format, pfring, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes

Children:

ee2ea572

Parents:

6010b54

Message:

Fixes to the new timestamp conversion test

File:

• test/test-convert.c (modified) (2 diffs)

test/test-convert.c

@@ -118 +118 @@
         tv1 = trace_get_timeval(packet);
         tv2 = trace_get_timeval(packet2);
-
-        if (tv1.tv_sec != tv2.tv_sec)
+        
+        if (tv1.tv_sec != tv2.tv_sec || tv1.tv_usec != tv2.tv_usec) { 
+                printf("Timestamps differ: %u.%u vs %u.%u",
+                                tv1.tv_sec, tv1.tv_usec, 
+                                tv2.tv_sec, tv2.tv_usec);
+
                 return 1;
-        if (tv1.tv_usec != tv1.tv_usec)
-                return 1;
+        }
         return 0;
 
@@ -261 +264 @@
                 
                 if (time_changed(packet, packet2)) {
-                        printf("Timestamps differ: %.6f vs %.6f\n",
-                                trace_get_seconds(packet),
-                                trace_get_seconds(packet2));
+                        error = 1;
+                        break;
                 }