Changeset 4631115 for test


Ignore:
Timestamp:
02/13/15 13:23:34 (6 years ago)
Author:
Richard Sanger <rsangerarj@…>
Branches:
4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, 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:
de74f88
Parents:
0b01fea (diff), 92d5f15 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' into develop.

Update to include fixes/features etc from the 3.0.22 release.

Conflicts:

README
lib/format_dag25.c
lib/format_dpdk.c
lib/format_linux.c
lib/trace.c
test/Makefile

Location:
test
Files:
2 added
2 edited

Legend:

Unmodified
Added
Removed
  • test/Makefile

    rf051c1b r4631115  
    99CFLAGS += $(INCLUDE)
    1010libdir = $(PREFIX)/lib/.libs:$(PREFIX)/libpacketdump/.libs
    11 LDLIBS = -L$(PREFIX)/lib/.libs -L$(PREFIX)/libpacketdump/.libs -ltrace -lpacketdump 
     11LDLIBS = -L$(PREFIX)/lib/.libs -L$(PREFIX)/libpacketdump/.libs -ltrace -lpacketdump
    1212
    1313BINS_DATASTRUCT = test-datastruct-vector test-datastruct-deque \
     
    1818
    1919BINS = test-pcap-bpf test-event test-time test-dir test-wireless test-errors \
    20         test-plen test-autodetect test-ports test-fragment test-live test-live-snaplen \
    21         $(BINS_DATASTRUCT) $(BINS_PARALLEL)
     20        test-plen test-autodetect test-ports test-fragment test-live \
     21        test-live-snaplen test-vxlan $(BINS_DATASTRUCT) $(BINS_PARALLEL)
    2222
    2323.PHONY: all clean distclean install depend test
  • test/do-tests.sh

    r95b6218 r3fc3267  
    230230do_test ./test-autodetect traces/5_packets.erf.xz
    231231
     232echo " * VXLan decode"
     233do_test ./test-vxlan
     234
    232235echo
    233236echo "Tests passed: $OK"
Note: See TracChangeset for help on using the changeset viewer.