Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.bin/make/unit-tests make(1): demonstrate wrong output wh...



details:   https://anonhg.NetBSD.org/src/rev/6d6f7441dec2
branches:  trunk
changeset: 976764:6d6f7441dec2
user:      rillig <rillig%NetBSD.org@localhost>
date:      Sat Oct 03 15:23:42 2020 +0000

description:
make(1): demonstrate wrong output when using csh in parallel mode

diffstat:

 usr.bin/make/unit-tests/shell-csh.exp |  2 ++
 usr.bin/make/unit-tests/shell-csh.mk  |  9 +++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diffs (33 lines):

diff -r ca1726b87e08 -r 6d6f7441dec2 usr.bin/make/unit-tests/shell-csh.exp
--- a/usr.bin/make/unit-tests/shell-csh.exp     Sat Oct 03 15:21:12 2020 +0000
+++ b/usr.bin/make/unit-tests/shell-csh.exp     Sat Oct 03 15:23:42 2020 +0000
@@ -1,8 +1,10 @@
 echo normal
 normal
+se
 hidden
 echo always
 always
+se
 echo ignore errors
 ignore errors
 exit status 0
diff -r ca1726b87e08 -r 6d6f7441dec2 usr.bin/make/unit-tests/shell-csh.mk
--- a/usr.bin/make/unit-tests/shell-csh.mk      Sat Oct 03 15:21:12 2020 +0000
+++ b/usr.bin/make/unit-tests/shell-csh.mk      Sat Oct 03 15:23:42 2020 +0000
@@ -1,8 +1,13 @@
-# $NetBSD: shell-csh.mk,v 1.2 2020/10/03 15:21:12 rillig Exp $
+# $NetBSD: shell-csh.mk,v 1.3 2020/10/03 15:23:42 rillig Exp $
 #
 # Tests for using a C shell for running the commands.
 
-.SHELL: name="csh" path="csh"
+.SHELL: name="csh" path="${:!which csh!}"
+
+# The -j option is needed to cover the code in JobOutput.
+#
+# FIXME: The "se " does not belong in the output.
+.MAKEFLAGS: -j1
 
 all:
        # This command is both printed and executed.



Home | Main Index | Thread Index | Old Index