From c6534f45d31367f2aacffcf9610583f8bb82858e Mon Sep 17 00:00:00 2001
From: sjg <sjg@NetBSD.org>
Date: Fri, 10 Apr 2015 20:41:59 +0000
Subject: [PATCH] export-all.mk should be including export.mk sadly some shells
 do not grok named signals.

---
 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(-)

diff --git a/usr.bin/make/unit-tests/export-all.exp b/usr.bin/make/unit-tests/export-all.exp
index f7c9aa59313b..e3aefd4f9e7d 100644
--- a/usr.bin/make/unit-tests/export-all.exp
+++ b/usr.bin/make/unit-tests/export-all.exp
@@ -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 --git a/usr.bin/make/unit-tests/export-all.mk b/usr.bin/make/unit-tests/export-all.mk
index 050e638dd82f..576487b53e02 100644
--- a/usr.bin/make/unit-tests/export-all.mk
+++ b/usr.bin/make/unit-tests/export-all.mk
@@ -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 @@ UT_OKDIR = ${${here}/../${here:T}:L:${M_tA}:T}
 
 .export
 
-.include "export"
+.include "export.mk"
 
 UT_TEST=export-all
 UT_ALL=even this gets exported
diff --git a/usr.bin/make/unit-tests/varshell.exp b/usr.bin/make/unit-tests/varshell.exp
index 2c9b015143f6..6ac8c88a65f1 100644
--- a/usr.bin/make/unit-tests/varshell.exp
+++ b/usr.bin/make/unit-tests/varshell.exp
@@ -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 --git a/usr.bin/make/unit-tests/varshell.mk b/usr.bin/make/unit-tests/varshell.mk
index 19a8eecaaad7..a0067360b104 100644
--- a/usr.bin/make/unit-tests/varshell.mk
+++ b/usr.bin/make/unit-tests/varshell.mk
@@ -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