From c119e4a444f9704ae519195758de1a4311fed337 Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Wed, 2 Aug 2017 08:54:18 +0000 Subject: [PATCH 1/2] Remove bogus bsd.subdir.mk .include bsd.subdir.mk is included from bsd.obj.mk, which is included via bsd.lib.mk. MFC after: 3 days --- lib/libcrypt/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/libcrypt/Makefile b/lib/libcrypt/Makefile index 7842c49e7491..f9c994c4edb3 100644 --- a/lib/libcrypt/Makefile +++ b/lib/libcrypt/Makefile @@ -46,4 +46,3 @@ PRECIOUSLIB= SUBDIR.${MK_TESTS}+= tests .include -.include From 63dc0fc9c7e4b3c753bbee359d5575ce802ab56c Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Wed, 2 Aug 2017 09:00:18 +0000 Subject: [PATCH 2/2] Fix accidental misconversion done in r321912 SUBDIR.${MK_TESTS} should append osmtest, not tests MFC after: 1 week MFC with: r321912 --- contrib/ofed/usr.bin/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/ofed/usr.bin/Makefile b/contrib/ofed/usr.bin/Makefile index ce8d6806ab35..10a43a41573d 100644 --- a/contrib/ofed/usr.bin/Makefile +++ b/contrib/ofed/usr.bin/Makefile @@ -4,7 +4,7 @@ SUBDIR= ibaddr ibnetdiscover ibping ibportstate ibroute ibsendtrap ibstat \ ibsysstat ibtracert opensm perfquery saquery \ sminfo smpdump smpquery vendstat -SUBDIR.${MK_TESTS}+= tests +SUBDIR.${MK_TESTS}+= osmtest SUBDIR_PARALLEL=