diff options
author | obrien <obrien@FreeBSD.org> | 2012-07-05 18:57:39 +0000 |
---|---|---|
committer | obrien <obrien@FreeBSD.org> | 2012-07-05 18:57:39 +0000 |
commit | a5082f7d022bf5a66b0d99b82055a51fbf929e9e (patch) | |
tree | 8fc3a3bd5e0cbc2df84dec0114dd994ff8212f40 /tools | |
parent | 57f9bac2dca8611cadf1656e44823f4e231ffc79 (diff) | |
parent | a4e243117eff56b96f000b878b431be3f67058df (diff) | |
download | FreeBSD-src-a5082f7d022bf5a66b0d99b82055a51fbf929e9e.zip FreeBSD-src-a5082f7d022bf5a66b0d99b82055a51fbf929e9e.tar.gz |
MFC: r238143: move "funny targets" from pre-build "make check" to the
regular regression tests.
Diffstat (limited to 'tools')
9 files changed, 42 insertions, 18 deletions
diff --git a/tools/build/make_check/Makefile b/tools/build/make_check/Makefile index cc8ca6b..346b4bb 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 0000000..064ab3a --- /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 0000000..573541a --- /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 0000000..573541a --- /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 0000000..e69de29 --- /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 0000000..e69de29 --- /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 0000000..09cb232 --- /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 0000000..b2f0364 --- /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 0000000..ec7e75c --- /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 $* |