From owner-svn-src-all@FreeBSD.ORG Thu Jan 8 14:45:57 2015 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 46EE3B5B; Thu, 8 Jan 2015 14:45:57 +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 30CC39FC; Thu, 8 Jan 2015 14:45:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t08EjvNg013033; Thu, 8 Jan 2015 14:45:57 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t08Ejtti013024; Thu, 8 Jan 2015 14:45:55 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201501081445.t08Ejtti013024@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Thu, 8 Jan 2015 14:45:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r276823 - in head: contrib/ofed/management/opensm/osmtest contrib/ofed/usr.bin contrib/ofed/usr.bin/osmtest contrib/ofed/usr.lib etc/mtree X-SVN-Group: head 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: Thu, 08 Jan 2015 14:45:57 -0000 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 #endif +#include #include #include #include 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 + +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 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