diff options
| author |   Ole Troan <ot@cisco.com> | 2016-08-25 12:26:47 +0200 |
|---|---|---|
| committer |   Dave Barach <openvpp@barachs.net> | 2016-08-29 11:57:31 +0000 |
| commit | d575e69177cc1462658ec1de1149730e0ffb0425 (patch) | |
| tree | 8dd59056b41c380ffb1cd24ef9adc14d21fd3794 /vnet/Makefile.am | |
| parent | d46cca174394794073585da4819eacc2bd72e862 (diff) | |
VPP-310 Mapping algorithm compute wrong ea-bits
Mapping of IPv4 prefixes ended up writing past IPv6 prefix + EA bits
length.
(Added some unit testing code).
Change-Id: I59893b44eea5cebf00a23afc405832741f84cf4f
Signed-off-by: Ole Troan <ot@cisco.com>
Diffstat (limited to 'vnet/Makefile.am')
| -rw-r--r-- | vnet/Makefile.am | 29 |
1 files changed, 20 insertions, 9 deletions
diff --git a/vnet/Makefile.am b/vnet/Makefile.am index a763291c2af..fd9c3e508b7 100644 --- a/vnet/Makefile.am +++ b/vnet/Makefile.am @@ -21,6 +21,11 @@ nobase_include_HEADERS = noinst_PROGRAMS = TESTS = +dpdk_libs = +if WITH_DPDK +dpdk_libs += -l:libdpdk.a +endif + ######################################## # Generic stuff ######################################## @@ -358,6 +363,20 @@ libvnet_la_SOURCES += \ nobase_include_HEADERS += \ vnet/map/map.h +if ENABLE_TESTS +TESTS += test_map +test_map_SOURCES = \ + vnet/map/test.c +test_map_CPPFLAGS = $(AM_CPPFLAGS) -DCLIB_DEBUG + +test_map_LDADD = libvnet.la -lvppinfra -lvlib \ + -lpthread -lvlibmemory -lvlibapi -lvlib_unix \ + -ldl -lsvm -lrt + +test_map_LDFLAGS = -static +endif + + ######################################## # Tunnel protocol: gre ######################################## @@ -448,7 +467,7 @@ nobase_include_HEADERS += \ if ENABLE_TESTS -LDS = -lvppinfra -l:libvlib.a -l:libdpdk.a -l:libvlibmemory.a \ +LDS = -lvppinfra -l:libvlib.a $(dpdk_libs) -l:libvlibmemory.a \ -l:libvlibapi.a -l:libsvm.a -lpthread -ldl -lrt -lm -l:libvlib_unix.a TESTS += test_cp_serdes test_lisp_types @@ -698,12 +717,6 @@ nobase_include_HEADERS += \ lib_LTLIBRARIES = libvnet.la libvnetplugin.la -dpdk_libs = - -if WITH_DPDK -dpdk_libs += -l:libdpdk.a -endif - pcap2pg_SOURCES = \ vnet/unix/pcap2pg.c \ vnet/unix/pcap.h @@ -712,5 +725,3 @@ pcap2pg_LDFLAGS = -static pcap2pg_LDADD = libvnet.la -l:libvppinfra.a -lpthread -lm -ldl noinst_PROGRAMS += pcap2pg - - |