Author: hselasky
Date: Thu Jan 8 14:45:54 2015
New Revision: 276823
URL: https://svnweb.freebsd.org/changeset/base/276823
Log:
Add makefile for the "osmtest" utility. While at it:
- Fix depend target by removing a space after an "-I" inclusion option.
- Fix some minor compile issues in the "osmtest" utility.
MFC after: 3 days
PR: 196580
Sponsored by: Mellanox Technologies
Added:
head/contrib/ofed/usr.bin/osmtest/
head/contrib/ofed/usr.bin/osmtest/Makefile (contents, props changed)
Modified:
head/contrib/ofed/management/opensm/osmtest/osmt_multicast.c
head/contrib/ofed/management/opensm/osmtest/osmtest.c
head/contrib/ofed/usr.bin/Makefile
head/contrib/ofed/usr.lib/Makefile
head/etc/mtree/BSD.tests.dist
Modified: head/contrib/ofed/management/opensm/osmtest/osmt_multicast.c
==============================================================================
--- head/contrib/ofed/management/opensm/osmtest/osmt_multicast.c Thu Jan
8 14:39:53 2015 (r276822)
+++ head/contrib/ofed/management/opensm/osmtest/osmt_multicast.c Thu Jan
8 14:45:54 2015 (r276823)
@@ -42,6 +42,7 @@
#ifndef __WIN__
#include <unistd.h>
#endif
+#include <sys/socket.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
Modified: head/contrib/ofed/management/opensm/osmtest/osmtest.c
==============================================================================
--- head/contrib/ofed/management/opensm/osmtest/osmtest.c Thu Jan 8
14:39:53 2015 (r276822)
+++ head/contrib/ofed/management/opensm/osmtest/osmtest.c Thu Jan 8
14:45:54 2015 (r276823)
@@ -3013,7 +3013,7 @@ Exit:
/**********************************************************************
**********************************************************************/
-inline uint32_t osmtest_path_rec_key_get(IN const ib_path_rec_t * const p_rec)
+static inline uint32_t osmtest_path_rec_key_get(IN const ib_path_rec_t * const
p_rec)
{
return (p_rec->dlid << 16 | p_rec->slid);
}
Modified: head/contrib/ofed/usr.bin/Makefile
==============================================================================
--- head/contrib/ofed/usr.bin/Makefile Thu Jan 8 14:39:53 2015
(r276822)
+++ head/contrib/ofed/usr.bin/Makefile Thu Jan 8 14:45:54 2015
(r276823)
@@ -1,6 +1,12 @@
-SUBDIR = ibaddr ibnetdiscover ibping ibportstate ibroute ibsendtrap ibstat
-SUBDIR += ibsysstat ibtracert opensm perfquery saquery
-SUBDIR += sminfo smpdump smpquery vendstat
+.include <src.opts.mk>
+
+SUBDIR= ibaddr ibnetdiscover ibping ibportstate ibroute ibsendtrap ibstat \
+ ibsysstat ibtracert opensm perfquery saquery \
+ sminfo smpdump smpquery vendstat
+
+.if ${MK_TESTS} != "no"
+SUBDIR+= osmtest
+.endif
SUBDIR_PARALLEL=
Added: head/contrib/ofed/usr.bin/osmtest/Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/contrib/ofed/usr.bin/osmtest/Makefile Thu Jan 8 14:45:54 2015
(r276823)
@@ -0,0 +1,34 @@
+# $FreeBSD$
+
+.include "../Makefile.inc"
+
+OPENSM= ${.CURDIR}/../../management/opensm
+.PATH: ${OPENSM}/osmtest ${OPENSM}/man
+
+BINDIR= ${TESTSBASE}/usr.bin/opensm
+PROG= osmtest
+
+SRCS= main.c \
+ osmt_inform.c \
+ osmt_mtl_regular_qp.c \
+ osmt_multicast.c \
+ osmt_service.c \
+ osmt_slvl_vl_arb.c \
+ osmtest.c
+
+LDADD= -libcommon \
+ -libmad \
+ -libumad \
+ -losmvendor \
+ -losmcomp \
+ -lopensm \
+ -lpthread
+
+CFLAGS= -DVENDOR_RMPP_SUPPORT -DDUAL_SIDED_RMPP \
+ -I${OPENSM}/osmtest/include
+
+MAN= osmtest.8
+
+WARNS?= 1
+
+.include <bsd.prog.mk>
Modified: head/contrib/ofed/usr.lib/Makefile
==============================================================================
--- head/contrib/ofed/usr.lib/Makefile Thu Jan 8 14:39:53 2015
(r276822)
+++ head/contrib/ofed/usr.lib/Makefile Thu Jan 8 14:45:54 2015
(r276823)
@@ -1,5 +1,5 @@
-SUBDIR = libibcommon libibmad libibumad libibverbs libmlx4 libmthca
-SUBDIR += libopensm libosmcomp libosmvendor libibcm librdmacm libsdp libcxgb4
+SUBDIR= libibcommon libibmad libibumad libibverbs libmlx4 libmthca \
+ libopensm libosmcomp libosmvendor libibcm librdmacm libsdp libcxgb4
SUBDIR_PARALLEL=
Modified: head/etc/mtree/BSD.tests.dist
==============================================================================
--- head/etc/mtree/BSD.tests.dist Thu Jan 8 14:39:53 2015
(r276822)
+++ head/etc/mtree/BSD.tests.dist Thu Jan 8 14:45:54 2015
(r276823)
@@ -358,6 +358,8 @@
..
ncal
..
+ opensm
+ ..
printf
..
sed
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
