Fix test failures for multipath-tcp.org kernel. (multipath-tcp#203)

* tests: Include multipath-tcp.org header as needed.

* tests: Drop dump_addrs check for mptcp.org kernel.

* tests: Only run mptcpwrap test for upstream kernel

tests/lib/test-util.c

@@ -16,8 +16,10 @@
 #if defined(HAVE_LINUX_MPTCP_H_UPSTREAM) \
         || defined(HAVE_LINUX_MPTCP_H_MPTCP_ORG)
 # include <linux/mptcp.h>
-#else
+#elif defined(HAVE_UPSTREAM_KERNEL)
 # include <mptcpd/private/mptcp_upstream.h>
+#else
+# include <mptcpd/private/mptcp_org.h>
 #endif
 
 #include "test-util.h"

tests/test-commands.c

@@ -621,7 +621,9 @@ int main(void)
          */
         assert(info.tests_called);
 
+#ifdef HAVE_UPSTREAM_KERNEL
         assert(info.dump_addrs_complete_count == 1);
+#endif
 
         l_idle_remove(idle);
         l_netlink_destroy(rtnl);

tests/test-mptcpwrap

@@ -7,6 +7,17 @@
 
 set -e
 
+# Check if we're using the upstream kernel.
+#
+# upstream:          net.mptcp.enabled
+# multipath-tcp.org: net.mptcp.mptcp_enabled
+key=`sysctl --names --pattern 'mptcp\.enabled' net.mptcp`
+if [ -z "$key" ]; then
+    # Do not run the test if we're not using the upstream kernel.
+    echo Not running upstream kernel.  libmptcpwrap will not be tested.
+    exit 0
+fi
+
 LD_PRELOAD=../src/.libs/libmptcpwrap.so \
 MPTCPWRAP_DEBUG=1 \
 ./mptcpwrap-tester