[src/trunk]: src/usr.bin/make/unit-tests export-all.mk should be including ex...

[sjg <sjg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/0ab5d0469879
branches:  trunk
changeset: 807446:0ab5d0469879
user:      sjg <sjg%NetBSD.org@localhost>
date:      Fri Apr 10 20:41:59 2015 +0000

description:
export-all.mk should be including export.mk
sadly some shells do not grok named signals.

diffstat:

 usr.bin/make/unit-tests/export-all.exp |  16 ++++++++++++----
 usr.bin/make/unit-tests/export-all.mk  |   4 ++--
 usr.bin/make/unit-tests/varshell.exp   |   2 +-
 usr.bin/make/unit-tests/varshell.mk    |   4 ++--
 4 files changed, 17 insertions(+), 9 deletions(-)

diffs (64 lines):

diff -r b4b2009c0dd5 -r 0ab5d0469879 usr.bin/make/unit-tests/export-all.exp
--- a/usr.bin/make/unit-tests/export-all.exp    Fri Apr 10 20:34:16 2015 +0000
+++ b/usr.bin/make/unit-tests/export-all.exp    Fri Apr 10 20:41:59 2015 +0000
@@ -1,4 +1,12 @@
-make: "export-all.mk" line 20: Could not find export
-make: Fatal errors encountered -- cannot continue
-make: stopped in unit-tests
-exit status 1
+UT_ALL=even this gets exported
+UT_BADDIR=unit-tests
+UT_DOLLAR=This is $UT_FU
+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
diff -r b4b2009c0dd5 -r 0ab5d0469879 usr.bin/make/unit-tests/export-all.mk
--- a/usr.bin/make/unit-tests/export-all.mk     Fri Apr 10 20:34:16 2015 +0000
+++ b/usr.bin/make/unit-tests/export-all.mk     Fri Apr 10 20:41:59 2015 +0000
@@ -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_F=fine
@@ -17,7 +17,7 @@
 
 .export
 
-.include "export"
+.include "export.mk"
 
 UT_TEST=export-all
 UT_ALL=even this gets exported
diff -r b4b2009c0dd5 -r 0ab5d0469879 usr.bin/make/unit-tests/varshell.exp
--- a/usr.bin/make/unit-tests/varshell.exp      Fri Apr 10 20:34:16 2015 +0000
+++ b/usr.bin/make/unit-tests/varshell.exp      Fri Apr 10 20:41:59 2015 +0000
@@ -1,6 +1,6 @@
 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 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 8: warning: "echo "output before the error"; false" returned non-zero status
 EXEC_FAILED=''
diff -r b4b2009c0dd5 -r 0ab5d0469879 usr.bin/make/unit-tests/varshell.mk
--- a/usr.bin/make/unit-tests/varshell.mk       Fri Apr 10 20:34:16 2015 +0000
+++ b/usr.bin/make/unit-tests/varshell.mk       Fri Apr 10 20:41:59 2015 +0000
@@ -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
 
 EXEC_FAILED            != /bin/no/such/command
-TERMINATED_BY_SIGNAL   != kill -ALRM $$$$
+TERMINATED_BY_SIGNAL   != kill -14 $$$$
 ERROR_NO_OUTPUT                != false
 ERROR_WITH_OUTPUT      != echo "output before the error"; false
 NO_ERROR_NO_OUTPUT     != true