[ovs-dev] OVS DPDK: dpdk_merge pull request for master

[Ben Pfaff]

Hi Ian and Tiago.

Commit 0e75dd821656 ("dpdk-tests: Add uni-tests for multi-seg mbufs.")
in this pull introduces the following warning from automake:

    tests/automake.mk:396: warning: tests_ovstest_SOURCES was already defined in condition TRUE, which includes condition DPDK_NETDEV ...
    Makefile.am:480:   'tests/automake.mk' included from here
    tests/automake.mk:353: ... 'tests_ovstest_SOURCES' previously defined here
    Makefile.am:480:   'tests/automake.mk' included from here

I think that the following fix is necessary:

diff --git a/tests/automake.mk b/tests/automake.mk
index b3941d0d2109..5fe98bd2124a 100644
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -393,7 +393,7 @@ tests_ovstest_SOURCES = \
 	tests/test-aa.c \
 	tests/test-stopwatch.c
 if DPDK_NETDEV
-tests_ovstest_SOURCES = \
+tests_ovstest_SOURCES += \
 	tests/test-dpdk-mbufs.c
 endif
 
If you agree, Ian, would you mind adding that to the pull request?

Thanks,

Ben.