Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 14 May 2014 18:43:14 +0000 (UTC)
From:      Julio Merino <jmmv@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r266074 - in head: etc/mtree usr.bin/bmake usr.bin/bmake/tests usr.bin/bmake/tests/archives usr.bin/bmake/tests/archives/fmt_44bsd usr.bin/bmake/tests/archives/fmt_44bsd_mod usr.bin/bma...
Message-ID:  <201405141843.s4EIhEVT083956@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jmmv
Date: Wed May 14 18:43:13 2014
New Revision: 266074
URL: http://svnweb.freebsd.org/changeset/base/266074

Log:
  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.

Added:
  head/usr.bin/bmake/tests/
     - copied from r266046, head/usr.bin/make/tests/
Deleted:
  head/usr.bin/make/tests/
Modified:
  head/etc/mtree/BSD.tests.dist
  head/usr.bin/bmake/Makefile
  head/usr.bin/bmake/tests/Makefile
  head/usr.bin/bmake/tests/archives/Makefile
  head/usr.bin/bmake/tests/archives/fmt_44bsd/Makefile
  head/usr.bin/bmake/tests/archives/fmt_44bsd_mod/Makefile
  head/usr.bin/bmake/tests/archives/fmt_oldbsd/Makefile
  head/usr.bin/bmake/tests/basic/Makefile
  head/usr.bin/bmake/tests/basic/t0/Makefile
  head/usr.bin/bmake/tests/basic/t1/Makefile
  head/usr.bin/bmake/tests/basic/t2/Makefile
  head/usr.bin/bmake/tests/basic/t3/Makefile
  head/usr.bin/bmake/tests/execution/Makefile
  head/usr.bin/bmake/tests/execution/ellipsis/Makefile
  head/usr.bin/bmake/tests/execution/empty/Makefile
  head/usr.bin/bmake/tests/execution/joberr/Makefile
  head/usr.bin/bmake/tests/execution/plus/Makefile
  head/usr.bin/bmake/tests/shell/Makefile
  head/usr.bin/bmake/tests/shell/builtin/Makefile
  head/usr.bin/bmake/tests/shell/meta/Makefile
  head/usr.bin/bmake/tests/shell/path/Makefile
  head/usr.bin/bmake/tests/shell/path_select/Makefile
  head/usr.bin/bmake/tests/shell/replace/Makefile
  head/usr.bin/bmake/tests/shell/select/Makefile
  head/usr.bin/bmake/tests/suffixes/Makefile
  head/usr.bin/bmake/tests/suffixes/basic/Makefile
  head/usr.bin/bmake/tests/suffixes/src_wild1/Makefile
  head/usr.bin/bmake/tests/suffixes/src_wild2/Makefile
  head/usr.bin/bmake/tests/syntax/Makefile
  head/usr.bin/bmake/tests/syntax/directive-t0/Makefile
  head/usr.bin/bmake/tests/syntax/enl/Makefile
  head/usr.bin/bmake/tests/syntax/funny-targets/Makefile
  head/usr.bin/bmake/tests/syntax/semi/Makefile
  head/usr.bin/bmake/tests/sysmk/Makefile
  head/usr.bin/bmake/tests/sysmk/t0/2/1/Makefile
  head/usr.bin/bmake/tests/sysmk/t0/2/Makefile
  head/usr.bin/bmake/tests/sysmk/t0/Makefile
  head/usr.bin/bmake/tests/sysmk/t0/mk/Makefile
  head/usr.bin/bmake/tests/sysmk/t1/2/1/Makefile
  head/usr.bin/bmake/tests/sysmk/t1/2/Makefile
  head/usr.bin/bmake/tests/sysmk/t1/Makefile
  head/usr.bin/bmake/tests/sysmk/t1/mk/Makefile
  head/usr.bin/bmake/tests/sysmk/t2/2/1/Makefile
  head/usr.bin/bmake/tests/sysmk/t2/2/Makefile
  head/usr.bin/bmake/tests/sysmk/t2/Makefile
  head/usr.bin/bmake/tests/sysmk/t2/mk/Makefile
  head/usr.bin/bmake/tests/variables/Makefile
  head/usr.bin/bmake/tests/variables/modifier_M/Makefile
  head/usr.bin/bmake/tests/variables/modifier_t/Makefile
  head/usr.bin/bmake/tests/variables/opt_V/Makefile
  head/usr.bin/bmake/tests/variables/t0/Makefile
  head/usr.bin/make/Makefile

Modified: head/etc/mtree/BSD.tests.dist
==============================================================================
--- head/etc/mtree/BSD.tests.dist	Wed May 14 18:41:59 2014	(r266073)
+++ head/etc/mtree/BSD.tests.dist	Wed May 14 18:43:13 2014	(r266074)
@@ -133,21 +133,7 @@
                 atf-sh
                 ..
             ..
-            calendar
-            ..
-            comm
-            ..
-            file2c
-            ..
-            join
-            ..
-            jot
-            ..
-            lastcomm
-            ..
-            m4
-            ..
-            make
+            bmake
                 archives
                     fmt_44bsd
                     ..
@@ -245,6 +231,20 @@
                     ..
                 ..
             ..
+            calendar
+            ..
+            comm
+            ..
+            file2c
+            ..
+            join
+            ..
+            jot
+            ..
+            lastcomm
+            ..
+            m4
+            ..
             ncal
             ..
             printf

Modified: head/usr.bin/bmake/Makefile
==============================================================================
--- head/usr.bin/bmake/Makefile	Wed May 14 18:41:59 2014	(r266073)
+++ head/usr.bin/bmake/Makefile	Wed May 14 18:43:13 2014	(r266074)
@@ -3,6 +3,7 @@
 #
 # $FreeBSD$
 
+.include <src.opts.mk>
 .sinclude "Makefile.inc"
 
 SRCTOP?= ${.CURDIR:H:H}
@@ -106,6 +107,10 @@ COPTS.meta.c += -DHAVE_FILEMON_H -I${FIL
 SUBDIR+= unit-tests
 .endif
 
+.if ${MK_TESTS} != no
+SUBDIR+= tests
+.endif
+
 
 MAN= ${PROG}.1
 MAN1= ${MAN}

Modified: head/usr.bin/bmake/tests/Makefile
==============================================================================
--- head/usr.bin/make/tests/Makefile	Wed May 14 16:32:27 2014	(r266046)
+++ head/usr.bin/bmake/tests/Makefile	Wed May 14 18:43:13 2014	(r266074)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake
 
 FILESDIR=	${TESTSDIR}
 FILES=		common.sh

Modified: head/usr.bin/bmake/tests/archives/Makefile
==============================================================================
--- head/usr.bin/make/tests/archives/Makefile	Wed May 14 16:32:27 2014	(r266046)
+++ head/usr.bin/bmake/tests/archives/Makefile	Wed May 14 18:43:13 2014	(r266074)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/archives
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/archives
 
 TESTS_SUBDIRS=	fmt_44bsd fmt_44bsd_mod fmt_oldbsd
 

Modified: head/usr.bin/bmake/tests/archives/fmt_44bsd/Makefile
==============================================================================
--- head/usr.bin/make/tests/archives/fmt_44bsd/Makefile	Wed May 14 16:32:27 2014	(r266046)
+++ head/usr.bin/bmake/tests/archives/fmt_44bsd/Makefile	Wed May 14 18:43:13 2014	(r266074)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/archives/fmt_44bsd
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/archives/fmt_44bsd
 
 TAP_TESTS_SH=	legacy_test
 

Modified: head/usr.bin/bmake/tests/archives/fmt_44bsd_mod/Makefile
==============================================================================
--- head/usr.bin/make/tests/archives/fmt_44bsd_mod/Makefile	Wed May 14 16:32:27 2014	(r266046)
+++ head/usr.bin/bmake/tests/archives/fmt_44bsd_mod/Makefile	Wed May 14 18:43:13 2014	(r266074)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/archives/fmt_44bsd_mod
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/archives/fmt_44bsd_mod
 
 TAP_TESTS_SH=	legacy_test
 

Modified: head/usr.bin/bmake/tests/archives/fmt_oldbsd/Makefile
==============================================================================
--- head/usr.bin/make/tests/archives/fmt_oldbsd/Makefile	Wed May 14 16:32:27 2014	(r266046)
+++ head/usr.bin/bmake/tests/archives/fmt_oldbsd/Makefile	Wed May 14 18:43:13 2014	(r266074)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/archives/fmt_oldbsd
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/archives/fmt_oldbsd
 
 TAP_TESTS_SH=	legacy_test
 

Modified: head/usr.bin/bmake/tests/basic/Makefile
==============================================================================
--- head/usr.bin/make/tests/basic/Makefile	Wed May 14 16:32:27 2014	(r266046)
+++ head/usr.bin/bmake/tests/basic/Makefile	Wed May 14 18:43:13 2014	(r266074)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/basic
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/basic
 
 TESTS_SUBDIRS=	t0 t1 t2 t3
 

Modified: head/usr.bin/bmake/tests/basic/t0/Makefile
==============================================================================
--- head/usr.bin/make/tests/basic/t0/Makefile	Wed May 14 16:32:27 2014	(r266046)
+++ head/usr.bin/bmake/tests/basic/t0/Makefile	Wed May 14 18:43:13 2014	(r266074)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/basic/t0
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/basic/t0
 
 TAP_TESTS_SH=	legacy_test
 

Modified: head/usr.bin/bmake/tests/basic/t1/Makefile
==============================================================================
--- head/usr.bin/make/tests/basic/t1/Makefile	Wed May 14 16:32:27 2014	(r266046)
+++ head/usr.bin/bmake/tests/basic/t1/Makefile	Wed May 14 18:43:13 2014	(r266074)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/basic/t1
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/basic/t1
 
 TAP_TESTS_SH=	legacy_test
 

Modified: head/usr.bin/bmake/tests/basic/t2/Makefile
==============================================================================
--- head/usr.bin/make/tests/basic/t2/Makefile	Wed May 14 16:32:27 2014	(r266046)
+++ head/usr.bin/bmake/tests/basic/t2/Makefile	Wed May 14 18:43:13 2014	(r266074)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/basic/t2
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/basic/t2
 
 TAP_TESTS_SH=	legacy_test
 

Modified: head/usr.bin/bmake/tests/basic/t3/Makefile
==============================================================================
--- head/usr.bin/make/tests/basic/t3/Makefile	Wed May 14 16:32:27 2014	(r266046)
+++ head/usr.bin/bmake/tests/basic/t3/Makefile	Wed May 14 18:43:13 2014	(r266074)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/basic/t3
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/basic/t3
 
 TAP_TESTS_SH=	legacy_test
 

Modified: head/usr.bin/bmake/tests/execution/Makefile
==============================================================================
--- head/usr.bin/make/tests/execution/Makefile	Wed May 14 16:32:27 2014	(r266046)
+++ head/usr.bin/bmake/tests/execution/Makefile	Wed May 14 18:43:13 2014	(r266074)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/execution
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/execution
 
 TESTS_SUBDIRS=	ellipsis empty joberr plus
 

Modified: head/usr.bin/bmake/tests/execution/ellipsis/Makefile
==============================================================================
--- head/usr.bin/make/tests/execution/ellipsis/Makefile	Wed May 14 16:32:27 2014	(r266046)
+++ head/usr.bin/bmake/tests/execution/ellipsis/Makefile	Wed May 14 18:43:13 2014	(r266074)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/execution/ellipsis
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/execution/ellipsis
 
 TAP_TESTS_SH=	legacy_test
 

Modified: head/usr.bin/bmake/tests/execution/empty/Makefile
==============================================================================
--- head/usr.bin/make/tests/execution/empty/Makefile	Wed May 14 16:32:27 2014	(r266046)
+++ head/usr.bin/bmake/tests/execution/empty/Makefile	Wed May 14 18:43:13 2014	(r266074)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/execution/empty
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/execution/empty
 
 TAP_TESTS_SH=	legacy_test
 

Modified: head/usr.bin/bmake/tests/execution/joberr/Makefile
==============================================================================
--- head/usr.bin/make/tests/execution/joberr/Makefile	Wed May 14 16:32:27 2014	(r266046)
+++ head/usr.bin/bmake/tests/execution/joberr/Makefile	Wed May 14 18:43:13 2014	(r266074)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/execution/joberr
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/execution/joberr
 
 TAP_TESTS_SH=	legacy_test
 

Modified: head/usr.bin/bmake/tests/execution/plus/Makefile
==============================================================================
--- head/usr.bin/make/tests/execution/plus/Makefile	Wed May 14 16:32:27 2014	(r266046)
+++ head/usr.bin/bmake/tests/execution/plus/Makefile	Wed May 14 18:43:13 2014	(r266074)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/execution/plus
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/execution/plus
 
 TAP_TESTS_SH=	legacy_test
 

Modified: head/usr.bin/bmake/tests/shell/Makefile
==============================================================================
--- head/usr.bin/make/tests/shell/Makefile	Wed May 14 16:32:27 2014	(r266046)
+++ head/usr.bin/bmake/tests/shell/Makefile	Wed May 14 18:43:13 2014	(r266074)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/shell
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/shell
 
 TESTS_SUBDIRS=	builtin meta path path_select replace select
 

Modified: head/usr.bin/bmake/tests/shell/builtin/Makefile
==============================================================================
--- head/usr.bin/make/tests/shell/builtin/Makefile	Wed May 14 16:32:27 2014	(r266046)
+++ head/usr.bin/bmake/tests/shell/builtin/Makefile	Wed May 14 18:43:13 2014	(r266074)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/shell/builtin
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/shell/builtin
 
 TAP_TESTS_SH=	legacy_test
 

Modified: head/usr.bin/bmake/tests/shell/meta/Makefile
==============================================================================
--- head/usr.bin/make/tests/shell/meta/Makefile	Wed May 14 16:32:27 2014	(r266046)
+++ head/usr.bin/bmake/tests/shell/meta/Makefile	Wed May 14 18:43:13 2014	(r266074)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/shell/meta
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/shell/meta
 
 TAP_TESTS_SH=	legacy_test
 

Modified: head/usr.bin/bmake/tests/shell/path/Makefile
==============================================================================
--- head/usr.bin/make/tests/shell/path/Makefile	Wed May 14 16:32:27 2014	(r266046)
+++ head/usr.bin/bmake/tests/shell/path/Makefile	Wed May 14 18:43:13 2014	(r266074)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/shell/path
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/shell/path
 
 TAP_TESTS_SH=	legacy_test
 

Modified: head/usr.bin/bmake/tests/shell/path_select/Makefile
==============================================================================
--- head/usr.bin/make/tests/shell/path_select/Makefile	Wed May 14 16:32:27 2014	(r266046)
+++ head/usr.bin/bmake/tests/shell/path_select/Makefile	Wed May 14 18:43:13 2014	(r266074)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/shell/path_select
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/shell/path_select
 
 TAP_TESTS_SH=	legacy_test
 

Modified: head/usr.bin/bmake/tests/shell/replace/Makefile
==============================================================================
--- head/usr.bin/make/tests/shell/replace/Makefile	Wed May 14 16:32:27 2014	(r266046)
+++ head/usr.bin/bmake/tests/shell/replace/Makefile	Wed May 14 18:43:13 2014	(r266074)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/shell/replace
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/shell/replace
 
 TAP_TESTS_SH=	legacy_test
 

Modified: head/usr.bin/bmake/tests/shell/select/Makefile
==============================================================================
--- head/usr.bin/make/tests/shell/select/Makefile	Wed May 14 16:32:27 2014	(r266046)
+++ head/usr.bin/bmake/tests/shell/select/Makefile	Wed May 14 18:43:13 2014	(r266074)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/shell/select
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/shell/select
 
 TAP_TESTS_SH=	legacy_test
 

Modified: head/usr.bin/bmake/tests/suffixes/Makefile
==============================================================================
--- head/usr.bin/make/tests/suffixes/Makefile	Wed May 14 16:32:27 2014	(r266046)
+++ head/usr.bin/bmake/tests/suffixes/Makefile	Wed May 14 18:43:13 2014	(r266074)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/suffixes
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/suffixes
 
 TESTS_SUBDIRS=	basic src_wild1 src_wild2
 

Modified: head/usr.bin/bmake/tests/suffixes/basic/Makefile
==============================================================================
--- head/usr.bin/make/tests/suffixes/basic/Makefile	Wed May 14 16:32:27 2014	(r266046)
+++ head/usr.bin/bmake/tests/suffixes/basic/Makefile	Wed May 14 18:43:13 2014	(r266074)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/suffixes/basic
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/suffixes/basic
 
 TAP_TESTS_SH=	legacy_test
 

Modified: head/usr.bin/bmake/tests/suffixes/src_wild1/Makefile
==============================================================================
--- head/usr.bin/make/tests/suffixes/src_wild1/Makefile	Wed May 14 16:32:27 2014	(r266046)
+++ head/usr.bin/bmake/tests/suffixes/src_wild1/Makefile	Wed May 14 18:43:13 2014	(r266074)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/suffixes/src_wild1
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/suffixes/src_wild1
 
 TAP_TESTS_SH=	legacy_test
 

Modified: head/usr.bin/bmake/tests/suffixes/src_wild2/Makefile
==============================================================================
--- head/usr.bin/make/tests/suffixes/src_wild2/Makefile	Wed May 14 16:32:27 2014	(r266046)
+++ head/usr.bin/bmake/tests/suffixes/src_wild2/Makefile	Wed May 14 18:43:13 2014	(r266074)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/suffixes/src_wild2
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/suffixes/src_wild2
 
 TAP_TESTS_SH=	legacy_test
 

Modified: head/usr.bin/bmake/tests/syntax/Makefile
==============================================================================
--- head/usr.bin/make/tests/syntax/Makefile	Wed May 14 16:32:27 2014	(r266046)
+++ head/usr.bin/bmake/tests/syntax/Makefile	Wed May 14 18:43:13 2014	(r266074)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/syntax
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/syntax
 
 TESTS_SUBDIRS=	directive-t0 enl funny-targets semi
 

Modified: head/usr.bin/bmake/tests/syntax/directive-t0/Makefile
==============================================================================
--- head/usr.bin/make/tests/syntax/directive-t0/Makefile	Wed May 14 16:32:27 2014	(r266046)
+++ head/usr.bin/bmake/tests/syntax/directive-t0/Makefile	Wed May 14 18:43:13 2014	(r266074)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/syntax/directive-t0
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/syntax/directive-t0
 
 TAP_TESTS_SH=	legacy_test
 

Modified: head/usr.bin/bmake/tests/syntax/enl/Makefile
==============================================================================
--- head/usr.bin/make/tests/syntax/enl/Makefile	Wed May 14 16:32:27 2014	(r266046)
+++ head/usr.bin/bmake/tests/syntax/enl/Makefile	Wed May 14 18:43:13 2014	(r266074)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/syntax/enl
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/syntax/enl
 
 TAP_TESTS_SH=	legacy_test
 

Modified: head/usr.bin/bmake/tests/syntax/funny-targets/Makefile
==============================================================================
--- head/usr.bin/make/tests/syntax/funny-targets/Makefile	Wed May 14 16:32:27 2014	(r266046)
+++ head/usr.bin/bmake/tests/syntax/funny-targets/Makefile	Wed May 14 18:43:13 2014	(r266074)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/syntax/funny-targets
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/syntax/funny-targets
 
 TAP_TESTS_SH=	legacy_test
 

Modified: head/usr.bin/bmake/tests/syntax/semi/Makefile
==============================================================================
--- head/usr.bin/make/tests/syntax/semi/Makefile	Wed May 14 16:32:27 2014	(r266046)
+++ head/usr.bin/bmake/tests/syntax/semi/Makefile	Wed May 14 18:43:13 2014	(r266074)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/syntax/semi
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/syntax/semi
 
 TAP_TESTS_SH=	legacy_test
 

Modified: head/usr.bin/bmake/tests/sysmk/Makefile
==============================================================================
--- head/usr.bin/make/tests/sysmk/Makefile	Wed May 14 16:32:27 2014	(r266046)
+++ head/usr.bin/bmake/tests/sysmk/Makefile	Wed May 14 18:43:13 2014	(r266074)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/sysmk
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/sysmk
 
 TESTS_SUBDIRS=	t0 t1 t2
 

Modified: head/usr.bin/bmake/tests/sysmk/t0/2/1/Makefile
==============================================================================
--- head/usr.bin/make/tests/sysmk/t0/2/1/Makefile	Wed May 14 16:32:27 2014	(r266046)
+++ head/usr.bin/bmake/tests/sysmk/t0/2/1/Makefile	Wed May 14 18:43:13 2014	(r266074)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/sysmk/t0/2/1
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/sysmk/t0/2/1
 
 TAP_TESTS_SH=	legacy_test
 

Modified: head/usr.bin/bmake/tests/sysmk/t0/2/Makefile
==============================================================================
--- head/usr.bin/make/tests/sysmk/t0/2/Makefile	Wed May 14 16:32:27 2014	(r266046)
+++ head/usr.bin/bmake/tests/sysmk/t0/2/Makefile	Wed May 14 18:43:13 2014	(r266074)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/sysmk/t0/2
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/sysmk/t0/2
 
 TESTS_SUBDIRS=	1
 

Modified: head/usr.bin/bmake/tests/sysmk/t0/Makefile
==============================================================================
--- head/usr.bin/make/tests/sysmk/t0/Makefile	Wed May 14 16:32:27 2014	(r266046)
+++ head/usr.bin/bmake/tests/sysmk/t0/Makefile	Wed May 14 18:43:13 2014	(r266074)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/sysmk/t0
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/sysmk/t0
 
 TESTS_SUBDIRS=	2
 SUBDIR=		mk

Modified: head/usr.bin/bmake/tests/sysmk/t0/mk/Makefile
==============================================================================
--- head/usr.bin/make/tests/sysmk/t0/mk/Makefile	Wed May 14 16:32:27 2014	(r266046)
+++ head/usr.bin/bmake/tests/sysmk/t0/mk/Makefile	Wed May 14 18:43:13 2014	(r266074)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/sysmk/t0/mk
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/sysmk/t0/mk
 
 FILESDIR=		${TESTSDIR}
 FILES=			sys.mk.test

Modified: head/usr.bin/bmake/tests/sysmk/t1/2/1/Makefile
==============================================================================
--- head/usr.bin/make/tests/sysmk/t1/2/1/Makefile	Wed May 14 16:32:27 2014	(r266046)
+++ head/usr.bin/bmake/tests/sysmk/t1/2/1/Makefile	Wed May 14 18:43:13 2014	(r266074)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/sysmk/t1/2/1
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/sysmk/t1/2/1
 
 TAP_TESTS_SH=	legacy_test
 

Modified: head/usr.bin/bmake/tests/sysmk/t1/2/Makefile
==============================================================================
--- head/usr.bin/make/tests/sysmk/t1/2/Makefile	Wed May 14 16:32:27 2014	(r266046)
+++ head/usr.bin/bmake/tests/sysmk/t1/2/Makefile	Wed May 14 18:43:13 2014	(r266074)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/sysmk/t1/2
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/sysmk/t1/2
 
 TESTS_SUBDIRS=	1
 

Modified: head/usr.bin/bmake/tests/sysmk/t1/Makefile
==============================================================================
--- head/usr.bin/make/tests/sysmk/t1/Makefile	Wed May 14 16:32:27 2014	(r266046)
+++ head/usr.bin/bmake/tests/sysmk/t1/Makefile	Wed May 14 18:43:13 2014	(r266074)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/sysmk/t1
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/sysmk/t1
 
 TESTS_SUBDIRS=	2
 SUBDIR=		mk

Modified: head/usr.bin/bmake/tests/sysmk/t1/mk/Makefile
==============================================================================
--- head/usr.bin/make/tests/sysmk/t1/mk/Makefile	Wed May 14 16:32:27 2014	(r266046)
+++ head/usr.bin/bmake/tests/sysmk/t1/mk/Makefile	Wed May 14 18:43:13 2014	(r266074)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/sysmk/t1/mk
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/sysmk/t1/mk
 
 FILESDIR=		${TESTSDIR}
 FILES=			sys.mk.test

Modified: head/usr.bin/bmake/tests/sysmk/t2/2/1/Makefile
==============================================================================
--- head/usr.bin/make/tests/sysmk/t2/2/1/Makefile	Wed May 14 16:32:27 2014	(r266046)
+++ head/usr.bin/bmake/tests/sysmk/t2/2/1/Makefile	Wed May 14 18:43:13 2014	(r266074)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/sysmk/t2/2/1
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/sysmk/t2/2/1
 
 TAP_TESTS_SH=	legacy_test
 

Modified: head/usr.bin/bmake/tests/sysmk/t2/2/Makefile
==============================================================================
--- head/usr.bin/make/tests/sysmk/t2/2/Makefile	Wed May 14 16:32:27 2014	(r266046)
+++ head/usr.bin/bmake/tests/sysmk/t2/2/Makefile	Wed May 14 18:43:13 2014	(r266074)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/sysmk/t2/2
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/sysmk/t2/2
 
 TESTS_SUBDIRS=	1
 

Modified: head/usr.bin/bmake/tests/sysmk/t2/Makefile
==============================================================================
--- head/usr.bin/make/tests/sysmk/t2/Makefile	Wed May 14 16:32:27 2014	(r266046)
+++ head/usr.bin/bmake/tests/sysmk/t2/Makefile	Wed May 14 18:43:13 2014	(r266074)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/sysmk/t2
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/sysmk/t2
 
 TESTS_SUBDIRS=	2
 SUBDIR=		mk

Modified: head/usr.bin/bmake/tests/sysmk/t2/mk/Makefile
==============================================================================
--- head/usr.bin/make/tests/sysmk/t2/mk/Makefile	Wed May 14 16:32:27 2014	(r266046)
+++ head/usr.bin/bmake/tests/sysmk/t2/mk/Makefile	Wed May 14 18:43:13 2014	(r266074)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/sysmk/t2/mk
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/sysmk/t2/mk
 
 FILESDIR=		${TESTSDIR}
 FILES=			sys.mk.test

Modified: head/usr.bin/bmake/tests/variables/Makefile
==============================================================================
--- head/usr.bin/make/tests/variables/Makefile	Wed May 14 16:32:27 2014	(r266046)
+++ head/usr.bin/bmake/tests/variables/Makefile	Wed May 14 18:43:13 2014	(r266074)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/variables
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/variables
 
 TESTS_SUBDIRS=	modifier_M modifier_t opt_V t0
 

Modified: head/usr.bin/bmake/tests/variables/modifier_M/Makefile
==============================================================================
--- head/usr.bin/make/tests/variables/modifier_M/Makefile	Wed May 14 16:32:27 2014	(r266046)
+++ head/usr.bin/bmake/tests/variables/modifier_M/Makefile	Wed May 14 18:43:13 2014	(r266074)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/variables/modifier_M
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/variables/modifier_M
 
 TAP_TESTS_SH=	legacy_test
 

Modified: head/usr.bin/bmake/tests/variables/modifier_t/Makefile
==============================================================================
--- head/usr.bin/make/tests/variables/modifier_t/Makefile	Wed May 14 16:32:27 2014	(r266046)
+++ head/usr.bin/bmake/tests/variables/modifier_t/Makefile	Wed May 14 18:43:13 2014	(r266074)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/variables/modifier_t
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/variables/modifier_t
 
 TAP_TESTS_SH=	legacy_test
 

Modified: head/usr.bin/bmake/tests/variables/opt_V/Makefile
==============================================================================
--- head/usr.bin/make/tests/variables/opt_V/Makefile	Wed May 14 16:32:27 2014	(r266046)
+++ head/usr.bin/bmake/tests/variables/opt_V/Makefile	Wed May 14 18:43:13 2014	(r266074)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/variables/opt_V
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/variables/opt_V
 
 TAP_TESTS_SH=	legacy_test
 

Modified: head/usr.bin/bmake/tests/variables/t0/Makefile
==============================================================================
--- head/usr.bin/make/tests/variables/t0/Makefile	Wed May 14 16:32:27 2014	(r266046)
+++ head/usr.bin/bmake/tests/variables/t0/Makefile	Wed May 14 18:43:13 2014	(r266074)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/variables/t0
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/variables/t0
 
 TAP_TESTS_SH=	legacy_test
 

Modified: head/usr.bin/make/Makefile
==============================================================================
--- head/usr.bin/make/Makefile	Wed May 14 18:41:59 2014	(r266073)
+++ head/usr.bin/make/Makefile	Wed May 14 18:43:13 2014	(r266074)
@@ -116,8 +116,4 @@ PROG=	fmake
 fmake.1: make.1
 	cp ${.ALLSRC} ${.TARGET}
 
-.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?201405141843.s4EIhEVT083956>