diff options
author | David E. O'Brien <obrien@FreeBSD.org> | 2012-07-05 18:23:36 +0000 |
---|---|---|
committer | David E. O'Brien <obrien@FreeBSD.org> | 2012-07-05 18:23:36 +0000 |
commit | 6e50170633d4beb7eeb0bc7815b296ab5feef90b (patch) | |
tree | b6d5c9b476081684885b8936419ac319def9a31a | |
parent | 7574a595f291c1547a51449d39bd4bbb9a9cf97f (diff) | |
download | src-6e50170633d4beb7eeb0bc7815b296ab5feef90b.tar.gz src-6e50170633d4beb7eeb0bc7815b296ab5feef90b.zip |
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.".
Notes
Notes:
svn path=/head/; revision=238143
9 files changed, 42 insertions, 18 deletions
diff --git a/tools/build/make_check/Makefile b/tools/build/make_check/Makefile index cc8ca6b918ce..346b4bb06856 100644 --- a/tools/build/make_check/Makefile +++ b/tools/build/make_check/Makefile @@ -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. diff --git a/tools/regression/usr.bin/make/syntax/funny-targets/Makefile b/tools/regression/usr.bin/make/syntax/funny-targets/Makefile new file mode 100644 index 000000000000..064ab3a9435f --- /dev/null +++ b/tools/regression/usr.bin/make/syntax/funny-targets/Makefile @@ -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} diff --git a/tools/regression/usr.bin/make/syntax/funny-targets/expected.status.1 b/tools/regression/usr.bin/make/syntax/funny-targets/expected.status.1 new file mode 100644 index 000000000000..573541ac9702 --- /dev/null +++ b/tools/regression/usr.bin/make/syntax/funny-targets/expected.status.1 @@ -0,0 +1 @@ +0 diff --git a/tools/regression/usr.bin/make/syntax/funny-targets/expected.status.2 b/tools/regression/usr.bin/make/syntax/funny-targets/expected.status.2 new file mode 100644 index 000000000000..573541ac9702 --- /dev/null +++ b/tools/regression/usr.bin/make/syntax/funny-targets/expected.status.2 @@ -0,0 +1 @@ +0 diff --git a/tools/regression/usr.bin/make/syntax/funny-targets/expected.stderr.1 b/tools/regression/usr.bin/make/syntax/funny-targets/expected.stderr.1 new file mode 100644 index 000000000000..e69de29bb2d1 --- /dev/null +++ b/tools/regression/usr.bin/make/syntax/funny-targets/expected.stderr.1 diff --git a/tools/regression/usr.bin/make/syntax/funny-targets/expected.stderr.2 b/tools/regression/usr.bin/make/syntax/funny-targets/expected.stderr.2 new file mode 100644 index 000000000000..e69de29bb2d1 --- /dev/null +++ b/tools/regression/usr.bin/make/syntax/funny-targets/expected.stderr.2 diff --git a/tools/regression/usr.bin/make/syntax/funny-targets/expected.stdout.1 b/tools/regression/usr.bin/make/syntax/funny-targets/expected.stdout.1 new file mode 100644 index 000000000000..09cb2328e9f7 --- /dev/null +++ b/tools/regression/usr.bin/make/syntax/funny-targets/expected.stdout.1 @@ -0,0 +1 @@ +colons::colons::target diff --git a/tools/regression/usr.bin/make/syntax/funny-targets/expected.stdout.2 b/tools/regression/usr.bin/make/syntax/funny-targets/expected.stdout.2 new file mode 100644 index 000000000000..b2f03648b48d --- /dev/null +++ b/tools/regression/usr.bin/make/syntax/funny-targets/expected.stdout.2 @@ -0,0 +1 @@ +exclamation!target diff --git a/tools/regression/usr.bin/make/syntax/funny-targets/test.t b/tools/regression/usr.bin/make/syntax/funny-targets/test.t new file mode 100644 index 000000000000..ec7e75c7a3a1 --- /dev/null +++ b/tools/regression/usr.bin/make/syntax/funny-targets/test.t @@ -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 $* |