Date: Sun, 11 Jan 2015 14:22:01 +0000 (UTC) From: Hans Petter Selasky <hselasky@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r276976 - in stable/10: contrib/ofed/management/opensm/osmtest contrib/ofed/usr.bin contrib/ofed/usr.bin/osmtest contrib/ofed/usr.lib etc/mtree Message-ID: <201501111422.t0BEM1DB054318@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: hselasky Date: Sun Jan 11 14:22:00 2015 New Revision: 276976 URL: https://svnweb.freebsd.org/changeset/base/276976 Log: MFC r276823: 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. PR: 196580 Added: stable/10/contrib/ofed/usr.bin/osmtest/ - copied from r276823, head/contrib/ofed/usr.bin/osmtest/ Modified: stable/10/contrib/ofed/management/opensm/osmtest/osmt_multicast.c stable/10/contrib/ofed/management/opensm/osmtest/osmtest.c stable/10/contrib/ofed/usr.bin/Makefile stable/10/contrib/ofed/usr.lib/Makefile stable/10/etc/mtree/BSD.tests.dist Directory Properties: stable/10/ (props changed) Modified: stable/10/contrib/ofed/management/opensm/osmtest/osmt_multicast.c ============================================================================== --- stable/10/contrib/ofed/management/opensm/osmtest/osmt_multicast.c Sun Jan 11 13:59:25 2015 (r276975) +++ stable/10/contrib/ofed/management/opensm/osmtest/osmt_multicast.c Sun Jan 11 14:22:00 2015 (r276976) @@ -42,6 +42,7 @@ #ifndef __WIN__ #include <unistd.h> #endif +#include <sys/socket.h> #include <stdio.h> #include <stdlib.h> #include <string.h> Modified: stable/10/contrib/ofed/management/opensm/osmtest/osmtest.c ============================================================================== --- stable/10/contrib/ofed/management/opensm/osmtest/osmtest.c Sun Jan 11 13:59:25 2015 (r276975) +++ stable/10/contrib/ofed/management/opensm/osmtest/osmtest.c Sun Jan 11 14:22:00 2015 (r276976) @@ -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: stable/10/contrib/ofed/usr.bin/Makefile ============================================================================== --- stable/10/contrib/ofed/usr.bin/Makefile Sun Jan 11 13:59:25 2015 (r276975) +++ stable/10/contrib/ofed/usr.bin/Makefile Sun Jan 11 14:22:00 2015 (r276976) @@ -1,7 +1,11 @@ .include <bsd.own.mk> -SUBDIR = ibaddr ibnetdiscover ibping ibportstate ibroute ibsendtrap ibstat -SUBDIR += ibsysstat ibtracert opensm perfquery saquery -SUBDIR += sminfo smpdump smpquery vendstat +SUBDIR= ibaddr ibnetdiscover ibping ibportstate ibroute ibsendtrap ibstat \ + ibsysstat ibtracert opensm perfquery saquery \ + sminfo smpdump smpquery vendstat + +.if ${MK_TESTS} != "no" +SUBDIR+= osmtest +.endif .include <bsd.subdir.mk> Modified: stable/10/contrib/ofed/usr.lib/Makefile ============================================================================== --- stable/10/contrib/ofed/usr.lib/Makefile Sun Jan 11 13:59:25 2015 (r276975) +++ stable/10/contrib/ofed/usr.lib/Makefile Sun Jan 11 14:22:00 2015 (r276976) @@ -1,6 +1,6 @@ .include <bsd.own.mk> -SUBDIR = libibcommon libibmad libibumad libibverbs libmlx4 libmthca -SUBDIR += libopensm libosmcomp libosmvendor libibcm librdmacm libsdp +SUBDIR= libibcommon libibmad libibumad libibverbs libmlx4 libmthca \ + libopensm libosmcomp libosmvendor libibcm librdmacm libsdp .include <bsd.subdir.mk> Modified: stable/10/etc/mtree/BSD.tests.dist ============================================================================== --- stable/10/etc/mtree/BSD.tests.dist Sun Jan 11 13:59:25 2015 (r276975) +++ stable/10/etc/mtree/BSD.tests.dist Sun Jan 11 14:22:00 2015 (r276976) @@ -307,6 +307,8 @@ .. ncal .. + opensm + .. printf .. sed
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201501111422.t0BEM1DB054318>