Re: svn commit: r318008 - head/sys/modules

[Ngie Cooper (yaneurabeya)]

> On May 8, 2017, at 22:06, O. Hartmann  wrote:
> 
> On Tue, 9 May 2017 04:59:05 + (UTC)
> Ngie Cooper  wrote:

…

> Ooopsie ... ;-)
> 
> Something went wrong after I sucked in this commit just a few seconds ago,
> compiling kernel failed:

You’re fast. Fixed in r318009 5 minutes ago.
-Ngie


signature.asc
Description: Message signed with OpenPGP using GPGMail

Re: svn commit: r318008 - head/sys/modules

[O. Hartmann]

On Tue, 9 May 2017 04:59:05 + (UTC)
Ngie Cooper  wrote:

> Author: ngie
> Date: Tue May  9 04:59:05 2017
> New Revision: 318008
> URL: https://svnweb.freebsd.org/changeset/base/318008
> 
> Log:
>   Only compile tests/ if MK_TESTS != no or ALL_MODULES is defined
>   
>   MFC after:  3 weeks
>   Sponsored by:   Dell EMC Isilon
> 
> Modified:
>   head/sys/modules/Makefile
> 
> Modified: head/sys/modules/Makefile
> ==
> --- head/sys/modules/Makefile Tue May  9 04:56:14 2017(r318007)
> +++ head/sys/modules/Makefile Tue May  9 04:59:05 2017(r318008)
> @@ -356,8 +356,6 @@ SUBDIR=   \
>   sysvipc \
>   tcp \
>   ${_ti} \
> - tests/framework \
> - tests/callout_test \
>   tl \
>   tmpfs \
>   ${_toecore} \
> @@ -516,6 +514,10 @@ _rtwnfw= rtwnfw
>  _cxgbe=  cxgbe
>  .endif
>  
> +.if ${MK_TESTS} != "no" || defined(ALL_MODULES)
> +SUBDIR+= tests
> +.endif
> +
>  .if ${MK_ZFS} != "no" || defined(ALL_MODULES)
>  SUBDIR+= zfs
>  .endif
> ___
> svn-src-h...@freebsd.org mailing list
> https://lists.freebsd.org/mailman/listinfo/svn-src-head
> To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Ooopsie ... ;-)

Something went wrong after I sucked in this commit just a few seconds ago,
compiling kernel failed:

[...]
usr/src/sys" WITH_EXTRA_TCP_STACKS="YES" make  obj
make[3]: "/usr/src/sys/modules/Makefile" line 517: Malformed conditional
(${MK_TESTS} != "no" || defined(ALL_MODULES)) make[3]: Fatal errors encountered
-- cannot continue make[3]: stopped in /usr/src/sys/modules
.ERROR_TARGET=''
.ERROR_META_FILE=''
.MAKE.LEVEL='3'
MAKEFILE=''
.MAKE.MODE='meta missing-filemon=yes missing-meta=yes silent=yes verbose'
.CURDIR='/usr/src/sys/modules'
.MAKE='make'
.OBJDIR='/usr/obj/usr/src/sys/FREYJA/modules/usr/src/sys/modules'
.TARGETS='obj'
DESTDIR=''
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r318008 - head/sys/modules

[Ngie Cooper]

Author: ngie
Date: Tue May  9 04:59:05 2017
New Revision: 318008
URL: https://svnweb.freebsd.org/changeset/base/318008

Log:
  Only compile tests/ if MK_TESTS != no or ALL_MODULES is defined
  
  MFC after:3 weeks
  Sponsored by: Dell EMC Isilon

Modified:
  head/sys/modules/Makefile

Modified: head/sys/modules/Makefile
==
--- head/sys/modules/Makefile   Tue May  9 04:56:14 2017(r318007)
+++ head/sys/modules/Makefile   Tue May  9 04:59:05 2017(r318008)
@@ -356,8 +356,6 @@ SUBDIR= \
sysvipc \
tcp \
${_ti} \
-   tests/framework \
-   tests/callout_test \
tl \
tmpfs \
${_toecore} \
@@ -516,6 +514,10 @@ _rtwnfw=   rtwnfw
 _cxgbe=cxgbe
 .endif
 
+.if ${MK_TESTS} != "no" || defined(ALL_MODULES)
+SUBDIR+=   tests
+.endif
+
 .if ${MK_ZFS} != "no" || defined(ALL_MODULES)
 SUBDIR+=   zfs
 .endif
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"