Changeset 5b91b48

Timestamp:

02/20/06 18:36:31 (15 years ago)

Author:

Perry Lorier <perry@…>

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:

1b4901a

Parents:

0a6638f

Message:

Added more test cases

Location:

test

Files:

• Makefile (modified) (1 diff)
• test-erf-write.c (added)
• test-pcap-bpf.c (added)
• test-pcap.c (added)
• test1.c (modified) (2 diffs)
• test2.c (modified) (4 diffs)
• traces/100_packets.pcap (added)

test/Makefile

@@ -9 +9 @@
 LDLIBS = -L$(libdir) -ltrace
 
-BINS = test1 test2
-.PHONY: all clean distclean install depend
+BINS = test1 test2 test-pcap test-pcap-bpf test-erf-write
+.PHONY: all clean distclean install depend test
 
 all: $(BINS) 
+
+test: all
+        for i in $(BINS); do                                    \
+                echo \* $$i;                                    \
+                LD_LIBRARY_PATH=$(libdir)                       \
+                 ./$$i || exit $$?;                             \
+        done                            
  
 clean:

test/test1.c

@@ -52 +52 @@
         char *uri = "erf:./traces/100_packets.erf";
         struct libtrace_t *trace;
+
+        printf("create trace\n");
         
         trace = trace_create(uri);
 
+        printf("created trace\n");
+
         trace_start(trace);
+
+        printf("started trace\n");
         
         if (trace) {
@@ -62 +68 @@
                 return 0;
         }
-        printf("failure: cannot open erf traces\n");
-        trace_perror("trace_create");
+        printf("failure: %s\n",trace_err.problem);
         return -1;
 }

test/test2.c

@@ -56 +56 @@
         int error = 0;
         int count = 0;
-        struct libtrace_packet_t packet;
+        libtrace_packet_t *packet;
 
         trace = trace_create(uri);
@@ -63 +63 @@
         
         for (;;) {
-                if ((psize = trace_read_packet(trace, &packet)) <0) {
+                packet=trace_create_packet();
+                if ((psize = trace_read_packet(trace, packet)) <0) {
                         error = 1;
                         break;
@@ -72 +73 @@
                 }
                 count ++;
+                trace_destroy_packet(&packet);
         }
         if (error == 0) {
@@ -81 +83 @@
                 }
         } else {
-                printf("failure: Error while reading trace\n");
-                trace_perror("trace_read_packet");
+                printf("failure: %s\n",trace_err.problem);
         }
         trace_destroy(trace);