From owner-svn-src-all@FreeBSD.ORG Sun Jan 11 14:22:02 2015 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CB185867; Sun, 11 Jan 2015 14:22:02 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B3DF98DA; Sun, 11 Jan 2015 14:22:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0BEM269054326; Sun, 11 Jan 2015 14:22:02 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0BEM1DB054318; Sun, 11 Jan 2015 14:22:01 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201501111422.t0BEM1DB054318@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Sun, 11 Jan 2015 14:22:01 +0000 (UTC) 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 X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Jan 2015 14:22:03 -0000 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 #endif +#include #include #include #include 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 -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 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 -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 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