Date: Tue, 30 Dec 2014 02:32:49 +0000 (UTC) From: Garrett Cooper <ngie@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: r276389 - in stable/10: etc/mtree usr.bin/bmake usr.bin/bmake/tests usr.bin/make usr.bin/make/tests Message-ID: <201412300232.sBU2WnvO010397@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Tue Dec 30 02:32:48 2014 New Revision: 276389 URL: https://svnweb.freebsd.org/changeset/base/276389 Log: MFC r266074,r266104,r266147: r266074: Move old fmake tests into bmake and hook them to the build. This first step is mostly to prevent the code from rotting even further and to ensure these do not get wiped when fmake's code is removed from the tree. These tests are currently being skipped because they detect the underlying make is not fmake and thus disable themselves -- and the reason is that some of the tests fail, possibly due to legitimate bugs. Enabling them to run against bmake will come separately. Lastly, it would be ideal if these tests were fed upstream but they are not ready for that yet. In the interim, just put them under usr.bin/bmake/ while we sort things out. The existence of a different unit-tests directory within here makes me feel less guilty about this. Change confirmed working with a clean amd64 build. r266104: Undo changes to the generated Makefile. Move tests directory to proper location, including updating the test to work in the more-fragile fmake -> bmake bootstrap environment. r266147: Makefile.inc is also included by the tests subdirectory, which results in SUBDIRS having tests added to it, which fails. Work around this by checking to make sure tests exists before adding it to subdirs and work to get the generated file fixed so we can rename Makefile.inc to something else so it isn't automatically included by subdirs... Added: stable/10/usr.bin/bmake/tests/ - copied from r266074, head/usr.bin/bmake/tests/ Deleted: stable/10/usr.bin/make/tests/ Modified: stable/10/etc/mtree/BSD.tests.dist stable/10/usr.bin/bmake/Makefile stable/10/usr.bin/bmake/Makefile.inc stable/10/usr.bin/make/Makefile Directory Properties: stable/10/ (props changed) Modified: stable/10/etc/mtree/BSD.tests.dist ============================================================================== --- stable/10/etc/mtree/BSD.tests.dist Tue Dec 30 01:28:31 2014 (r276388) +++ stable/10/etc/mtree/BSD.tests.dist Tue Dec 30 02:32:48 2014 (r276389) @@ -169,21 +169,7 @@ usr.bin apply .. - calendar - .. - comm - .. - file2c - .. - join - .. - jot - .. - lastcomm - .. - m4 - .. - make + bmake archives fmt_44bsd .. @@ -281,6 +267,20 @@ .. .. .. + calendar + .. + comm + .. + file2c + .. + join + .. + jot + .. + lastcomm + .. + m4 + .. ncal .. printf Modified: stable/10/usr.bin/bmake/Makefile ============================================================================== --- stable/10/usr.bin/bmake/Makefile Tue Dec 30 01:28:31 2014 (r276388) +++ stable/10/usr.bin/bmake/Makefile Tue Dec 30 02:32:48 2014 (r276389) @@ -106,7 +106,6 @@ COPTS.meta.c += -DHAVE_FILEMON_H -I${FIL SUBDIR+= unit-tests .endif - MAN= ${PROG}.1 MAN1= ${MAN} Modified: stable/10/usr.bin/bmake/Makefile.inc ============================================================================== --- stable/10/usr.bin/bmake/Makefile.inc Tue Dec 30 01:28:31 2014 (r276388) +++ stable/10/usr.bin/bmake/Makefile.inc Tue Dec 30 02:32:48 2014 (r276389) @@ -21,5 +21,12 @@ PROG= make NO_SHARED?= YES .endif +# hack to not add tests to tests subdir since this is included from +# there and to avoid renaming things that require changes to generated +# files. +.if defined(MK_TESTS) && ${MK_TESTS} != no && exists(${.CURDIR}/tests) +SUBDIR+= tests +.endif + WARNS=3 CFLAGS+= -DNO_PWD_OVERRIDE Modified: stable/10/usr.bin/make/Makefile ============================================================================== --- stable/10/usr.bin/make/Makefile Tue Dec 30 01:28:31 2014 (r276388) +++ stable/10/usr.bin/make/Makefile Tue Dec 30 02:32:48 2014 (r276389) @@ -118,8 +118,4 @@ fmake.1: make.1 cp ${.ALLSRC} ${.TARGET} .endif -.if ${MK_TESTS} != "no" -SUBDIR+= tests -.endif - .include <bsd.prog.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201412300232.sBU2WnvO010397>