svn commit: r346257 - stable/12/tests/sys/netmap

[Enji Cooper]

Author: ngie
Date: Tue Apr 16 01:03:38 2019
New Revision: 346257
URL: https://svnweb.freebsd.org/changeset/base/346257

Log:
  MFC r345644,r346061:
  
  r345644 (by olivier):
  
  Skip this test if if_tap module is not available
  
  PR:		236842
  
  r346061:
  
  Polish netmap(4) testcases a bit
  
  1. Not all kernels have netmap(4) support. Check for netmap(4) support before
     attempting to run the tests via the `PLAIN_REQUIRE_KERNEL_MODULE(..)` macro.
  2. Libraries shouldn't be added to LDFLAGS; they should be added to LIBADD
     instead. This allows the build system to evaluate dependencies for sanity.
  3. Sort some of the Makefile variables per bsd.README.
  
  1., in particular, will resolve failures when running this testcase on kernels
  lacking netmap(4) support, e.g., the i386 GENERIC kernels on ^/stable/11 and
  ^/stable/12.
  
  PR:		237129

Modified:
  stable/12/tests/sys/netmap/Makefile
  stable/12/tests/sys/netmap/ctrl-api-test.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/tests/sys/netmap/Makefile
==============================================================================
--- stable/12/tests/sys/netmap/Makefile	Tue Apr 16 01:03:32 2019	(r346256)
+++ stable/12/tests/sys/netmap/Makefile	Tue Apr 16 01:03:38 2019	(r346257)
@@ -6,8 +6,10 @@ TESTSDIR=	${TESTSBASE}/sys/netmap
 TEST_METADATA+=	required_user="root"
 TEST_METADATA+=	is_exclusive=true
 
-LDFLAGS+= 	-lpthread
 PLAIN_TESTS_C+=	ctrl-api-test
+
+CFLAGS+=	-I${SRCTOP}/tests
+LIBADD+= 	pthread
 
 WARNS?=		6
 

Modified: stable/12/tests/sys/netmap/ctrl-api-test.c
==============================================================================
--- stable/12/tests/sys/netmap/ctrl-api-test.c	Tue Apr 16 01:03:32 2019	(r346256)
+++ stable/12/tests/sys/netmap/ctrl-api-test.c	Tue Apr 16 01:03:38 2019	(r346257)
@@ -48,9 +48,15 @@
 #include <unistd.h>
 #include <signal.h>
 
+#ifdef __FreeBSD__
+#include "freebsd_test_suite/macros.h"
+#endif
+
+
 #ifdef __linux__
 #include <sys/eventfd.h>
 #else
+
 static int
 eventfd(int x __unused, int y __unused)
 {
@@ -1830,6 +1836,11 @@ main(int argc, char **argv)
 	int list = 0;
 	int opt;
 	int i;
+
+#ifdef __FreeBSD__
+	PLAIN_REQUIRE_KERNEL_MODULE("if_tap", 0);
+	PLAIN_REQUIRE_KERNEL_MODULE("netmap", 0);
+#endif
 
 	memset(&ctx_, 0, sizeof(ctx_));