Changeset 17c5749 for test


Ignore:
Timestamp:
07/22/14 12:57:50 (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:
41148f2
Parents:
54834a1 (diff), a6c77b0 (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 remote-tracking branch 'upsteam/develop' into FixingDPDK

Conflicts:

README
lib/format_linux.c
test/Makefile

Location:
test
Files:
8 added
2 edited

Legend:

Unmodified
Added
Removed
  • test/Makefile

    r59ef093 r17c5749  
    1818
    1919BINS = test-pcap-bpf test-event test-time test-dir test-wireless test-errors \
    20         test-plen test-autodetect $(BINS_DATASTRUCT) $(BINS_PARALLEL)
     20        test-plen test-autodetect test-ports test-fragment test-live test-live-snaplen \
     21        $(BINS_DATASTRUCT) $(BINS_PARALLEL)
    2122
    2223.PHONY: all clean distclean install depend test
  • test/do-tests.sh

    r5692bc4 r95b6218  
    7272echo \* Testing payload length
    7373do_test ./test-plen
     74
     75echo \* Testing port numbers
     76do_test ./test-ports
     77
     78echo \* Testing fragment parsing
     79do_test ./test-fragment
    7480
    7581echo \* Testing event framework
     
    221227echo " * format autodetection - bzip2"
    222228do_test ./test-autodetect traces/5_packets.erf.bz2
     229echo " * format autodetection - lzma"
     230do_test ./test-autodetect traces/5_packets.erf.xz
    223231
    224232echo
Note: See TracChangeset for help on using the changeset viewer.