Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

export-all.mk should be including export.mk 

sadly some shells do not grok named signals.
This commit is contained in:
sjg 2015-04-10 20:41:59 +00:00
parent 7c5ca5f421
commit c6534f45d3
4 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
usr.bin/make/unit-tests/export-all.exp
View File

@ -1,4 +1,12 @@
make: "export-all.mk" line 20: Could not find export UT_ALL=even this gets exported
make: Fatal errors encountered -- cannot continue UT_BADDIR=unit-tests
make: stopped in unit-tests UT_DOLLAR=This is $UT_FU
exit status 1 UT_F=fine
UT_FOO=foobar is fubar
UT_FU=fubar
UT_NO=all
UT_OK=good
UT_OKDIR=unit-tests
UT_TEST=export-all
UT_ZOO=hoopie
exit status 0

4
usr.bin/make/unit-tests/export-all.mk
View File

@ -1,4 +1,4 @@
# $Id: export-all.mk,v 1.1 2014/08/21 13:44:51 apb Exp $ # $Id: export-all.mk,v 1.2 2015/04/10 20:41:59 sjg Exp $
UT_OK=good UT_OK=good
UT_F=fine UT_F=fine
@ -17,7 +17,7 @@ UT_OKDIR = ${${here}/../${here:T}:L:${M_tA}:T}
.export .export
.include "export" .include "export.mk"
UT_TEST=export-all UT_TEST=export-all
UT_ALL=even this gets exported UT_ALL=even this gets exported

2
usr.bin/make/unit-tests/varshell.exp
View File

@ -1,6 +1,6 @@
sh: /bin/no/such/command: not found sh: /bin/no/such/command: not found
make: "varshell.mk" line 5: warning: "/bin/no/such/command" returned non-zero status make: "varshell.mk" line 5: warning: "/bin/no/such/command" returned non-zero status
make: "varshell.mk" line 6: warning: "kill -ALRM $$" exited on a signal make: "varshell.mk" line 6: warning: "kill -14 $$" exited on a signal
make: "varshell.mk" line 7: warning: "false" returned non-zero status make: "varshell.mk" line 7: warning: "false" returned non-zero status
make: "varshell.mk" line 8: warning: "echo "output before the error"; false" returned non-zero status make: "varshell.mk" line 8: warning: "echo "output before the error"; false" returned non-zero status
EXEC_FAILED='' EXEC_FAILED=''

4
usr.bin/make/unit-tests/varshell.mk
View File

@ -1,9 +1,9 @@
# $Id: varshell.mk,v 1.1 2014/08/21 13:44:52 apb Exp $ # $Id: varshell.mk,v 1.2 2015/04/10 20:41:59 sjg Exp $
# #
# Test VAR != shell command # Test VAR != shell command
EXEC_FAILED != /bin/no/such/command EXEC_FAILED != /bin/no/such/command
TERMINATED_BY_SIGNAL != kill -ALRM $$$$ TERMINATED_BY_SIGNAL != kill -14 $$$$
ERROR_NO_OUTPUT != false ERROR_NO_OUTPUT != false
ERROR_WITH_OUTPUT != echo "output before the error"; false ERROR_WITH_OUTPUT != echo "output before the error"; false
NO_ERROR_NO_OUTPUT != true NO_ERROR_NO_OUTPUT != true