From owner-svn-src-all@FreeBSD.ORG Thu Jul 5 18:23:37 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 45183106566B; Thu, 5 Jul 2012 18:23:37 +0000 (UTC) (envelope-from obrien@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 2E19F8FC08; Thu, 5 Jul 2012 18:23:37 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q65INb2d005738; Thu, 5 Jul 2012 18:23:37 GMT (envelope-from obrien@svn.freebsd.org) Received: (from obrien@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q65INa8m005727; Thu, 5 Jul 2012 18:23:36 GMT (envelope-from obrien@svn.freebsd.org) Message-Id: <201207051823.q65INa8m005727@svn.freebsd.org> From: "David E. O'Brien" Date: Thu, 5 Jul 2012 18:23:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r238143 - in head/tools: build/make_check regression/usr.bin/make/syntax/funny-targets X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 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, 05 Jul 2012 18:23:37 -0000 Author: obrien Date: Thu Jul 5 18:23:36 2012 New Revision: 238143 URL: http://svn.freebsd.org/changeset/base/238143 Log: Remove the "funny targets" make check. We no longer need embedded :: targets to build FreeBSD (they are used in Perl man pages). We never needed embedded "!" in targets that I can find. We got this from OpenBSD and I cannot find any other make that supports such things -- contrary to their commit message claim: "This behaviour is also consistent with other versions of make.". Added: head/tools/regression/usr.bin/make/syntax/funny-targets/ head/tools/regression/usr.bin/make/syntax/funny-targets/Makefile (contents, props changed) head/tools/regression/usr.bin/make/syntax/funny-targets/expected.status.1 (contents, props changed) head/tools/regression/usr.bin/make/syntax/funny-targets/expected.status.2 (contents, props changed) head/tools/regression/usr.bin/make/syntax/funny-targets/expected.stderr.1 (contents, props changed) head/tools/regression/usr.bin/make/syntax/funny-targets/expected.stderr.2 (contents, props changed) head/tools/regression/usr.bin/make/syntax/funny-targets/expected.stdout.1 (contents, props changed) head/tools/regression/usr.bin/make/syntax/funny-targets/expected.stdout.2 (contents, props changed) head/tools/regression/usr.bin/make/syntax/funny-targets/test.t (contents, props changed) Modified: head/tools/build/make_check/Makefile Modified: head/tools/build/make_check/Makefile ============================================================================== --- head/tools/build/make_check/Makefile Thu Jul 5 18:19:35 2012 (r238142) +++ head/tools/build/make_check/Makefile Thu Jul 5 18:23:36 2012 (r238143) @@ -23,7 +23,7 @@ NIL= SMAKE= MAKEFLAGS= ${MAKE} -C ${.CURDIR} all: - @echo '1..17' + @echo '1..16' @${SMAKE} C_check || { cd ${.CURDIR} ; ${MAKE} failure ; } @echo "ok 1 - C_check # Test of -C flag existence detected no regression." @echo 1:${DATA1} 2:${DATA2} 3:${DATA3} 4:${DATA4} 5:${DATA5} | \ @@ -40,26 +40,24 @@ all: @echo "ok 6 - notdef # Test notdef detected no regression." @${SMAKE} modifiers || ${SMAKE} failure @echo "ok 7 - modifiers # Test modifiers detected no regression." - @${SMAKE} funny_targets || ${SMAKE} failure - @echo "ok 8 funny_targets # Test funny_targets detected no regression." @${SMAKE} arith_expr || ${SMAKE} failure - @echo "ok 9 arith_expr # Test arith_expr detected no regression." + @echo "ok 8 arith_expr # Test arith_expr detected no regression." @${SMAKE} PATH_exists || ${SMAKE} failure - @echo "ok 10 PATH_exists # Test PATH_exists detected no regression." + @echo "ok 9 PATH_exists # Test PATH_exists detected no regression." @${SMAKE} double_quotes || ${SMAKE} failure - @echo "ok 11 double_quotes # Test double_quotes detected no regression." + @echo "ok 10 double_quotes # Test double_quotes detected no regression." @! ${SMAKE} double_quotes2 >/dev/null 2>&1 && true || ${SMAKE} failure - @echo "ok 12 double_quotes2 # Test double_quotes2 detected no regression." + @echo "ok 11 double_quotes2 # Test double_quotes2 detected no regression." @${SMAKE} pass_cmd_vars || ${SMAKE} failure - @echo "ok 13 pass_cmd_vars # Test pass_cmd_vars detected no regression." + @echo "ok 12 pass_cmd_vars # Test pass_cmd_vars detected no regression." @${SMAKE} plus_flag || ${SMAKE} failure - @echo "ok 14 plus_flag # Test plus_flag detected no regression." + @echo "ok 13 plus_flag # Test plus_flag detected no regression." @! ${SMAKE} shell >/dev/null 2>&1 && true || ${SMAKE} failure - @echo "ok 15 shell # Test shell detected no regression." + @echo "ok 14 shell # Test shell detected no regression." @${SMAKE} shell_1 || ${SMAKE} failure - @echo "ok 16 shell_1 # Test shell_1 detected no regression." + @echo "ok 15 shell_1 # Test shell_1 detected no regression." @${SMAKE} shell_2 || ${SMAKE} failure - @echo "ok 17 shell_2 # Test shell_2 detected no regression." + @echo "ok 16 shell_2 # Test shell_2 detected no regression." .if make(C_check) C_check: @@ -107,12 +105,6 @@ modifiers: fi .endif -.if make(funny_targets) -funny_targets: colons::target exclamation!target -colons::target: -exclamation!target: -.endif - .if make(arith_expr) arith_expr: # See if arithmetic expression parsing is broken. Added: head/tools/regression/usr.bin/make/syntax/funny-targets/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/regression/usr.bin/make/syntax/funny-targets/Makefile Thu Jul 5 18:23:36 2012 (r238143) @@ -0,0 +1,14 @@ +# $FreeBSD$ +# +# PR bin/6612 / GRN r102178 +# + +test1: colons::colons::target + +colons::colons::target: + @echo '${.TARGET}' + +test2: exclamation!target + +exclamation!target: + @echo '${.TARGET} Added: head/tools/regression/usr.bin/make/syntax/funny-targets/expected.status.1 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/regression/usr.bin/make/syntax/funny-targets/expected.status.1 Thu Jul 5 18:23:36 2012 (r238143) @@ -0,0 +1 @@ +0 Added: head/tools/regression/usr.bin/make/syntax/funny-targets/expected.status.2 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/regression/usr.bin/make/syntax/funny-targets/expected.status.2 Thu Jul 5 18:23:36 2012 (r238143) @@ -0,0 +1 @@ +0 Added: head/tools/regression/usr.bin/make/syntax/funny-targets/expected.stderr.1 ============================================================================== Added: head/tools/regression/usr.bin/make/syntax/funny-targets/expected.stderr.2 ============================================================================== Added: head/tools/regression/usr.bin/make/syntax/funny-targets/expected.stdout.1 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/regression/usr.bin/make/syntax/funny-targets/expected.stdout.1 Thu Jul 5 18:23:36 2012 (r238143) @@ -0,0 +1 @@ +colons::colons::target Added: head/tools/regression/usr.bin/make/syntax/funny-targets/expected.stdout.2 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/regression/usr.bin/make/syntax/funny-targets/expected.stdout.2 Thu Jul 5 18:23:36 2012 (r238143) @@ -0,0 +1 @@ +exclamation!target Added: head/tools/regression/usr.bin/make/syntax/funny-targets/test.t ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/regression/usr.bin/make/syntax/funny-targets/test.t Thu Jul 5 18:23:36 2012 (r238143) @@ -0,0 +1,14 @@ +#!/bin/sh + +# $FreeBSD$ + +cd `dirname $0` +. ../../common.sh + +# Description +DESC='Target names with "funny" embeded characters.' + +# Run +TEST_N=2 + +eval_cmd $*