Merge 3a871f9 into ec93b41

Author: ossama-othman

tests/lib/test-util.c

@@ -12,6 +12,7 @@
 #endif
 
 #include <unistd.h>
+#include <stdlib.h>
 
 #if defined(HAVE_LINUX_MPTCP_H_UPSTREAM) \
         || defined(HAVE_LINUX_MPTCP_H_MPTCP_ORG)
@@ -22,6 +23,8 @@
 # include <mptcpd/private/mptcp_org.h>
 #endif
 
+#include "../src/netlink_pm.h"  // For MPTCP_SYSCTL_BASE
+
 #include "test-util.h"
 
 
@@ -34,6 +37,30 @@ char const *tests_get_pm_family_name(void)
 #endif
 }
 
+static bool is_mptcp_kernel(void)
+{
+        // Kernel supports MPTCP if /proc/sys/net/mptcp exists.
+        return access(MPTCP_SYSCTL_BASE, R_OK | X_OK) == 0;
+}
+
+void tests_skip_if_no_mptcp(void)
+{
+        /*
+          An exit status of 77 causes the Automake test driver,
+          i.e. the `test-driver' script, to consider the test result
+          as SKIP rather than PASS or FAIL.
+
+          Tests that should be skipped under some conditions, such as
+          when not running a MPTCP capable kernel, should exit the
+          process with this value.
+        */
+        static int const SKIP_EXIT_STATUS = 77;
+
+        if (!is_mptcp_kernel())
+                exit(SKIP_EXIT_STATUS);
+}
+
+
 
 /*
   Local Variables:

tests/lib/test-util.h

@@ -4,14 +4,26 @@
  *
  * @brief mptcpd test utilities library.
  *
- * Copyright (c) 2020, Intel Corporation
+ * Copyright (c) 2020, 2022, Intel Corporation
  */
 
 #ifndef MPTCP_TEST_UTIL_H
 #define MPTCP_TEST_UTIL_H
 
 
+/// Get MPTCP path management generic netlink API family name.
 char const *tests_get_pm_family_name(void);
 
+/**
+ * @brief Exit test process if the kernel does not support MPTCP.
+ *
+ * If the kernel does not support MPTCP exit the current test process
+ * with an exit status suitable for making the Automake @c test-driver
+ * script interpret the test result as @c SKIP instead of @c PASS or
+ * @c FAIL.  This is useful for tests that need MPTCP but are run on
+ * platforms with a non-MPTCP capable kernel.
+ */
+void tests_skip_if_no_mptcp(void);
+
 
 #endif  // MPTCP_TEST_UTIL_H

tests/test-commands.c

@@ -570,6 +570,9 @@ static void idle_callback(struct l_idle *idle, void *user_data)
 
 int main(void)
 {
+        // Skip this test if the kernel is not MPTCP capable.
+        tests_skip_if_no_mptcp();
+
         if (!l_main_init())
                 return -1;
 

tests/test-mptcpwrap

@@ -7,15 +7,18 @@
 
 set -e
 
+# An exit status of 77 causes the Automake test driver to consider the
+# test as skipped.
+skip_exit_status=77
+
 # 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.
+# upstream:          /proc/sys/net/mptcp/enabled
+# multipath-tcp.org: /proc/sys/net/mptcp/mptcp_enabled
+if [ ! -f /proc/sys/net/mptcp/enabled ]; then
+    # Skip the test if we're not using the upstream kernel.
     echo Not running upstream kernel.  libmptcpwrap will not be tested.
-    exit 0
+    exit $skip_exit_status
 fi
 
 LD_PRELOAD=../src/.libs/libmptcpwrap.so \

tests/test-path-manager.c

@@ -161,6 +161,9 @@ static void timeout_callback(struct l_timeout *timeout,
 
 int main(void)
 {
+        // Skip this test if the kernel is not MPTCP capable.
+        tests_skip_if_no_mptcp();
+
         if (!l_main_init())
                 return -1;