Module Name:    src
Committed By:   rillig
Date:           Sat Oct  3 15:23:42 UTC 2020

Modified Files:
        src/usr.bin/make/unit-tests: shell-csh.exp shell-csh.mk

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


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/usr.bin/make/unit-tests/shell-csh.exp \
    src/usr.bin/make/unit-tests/shell-csh.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.bin/make/unit-tests/shell-csh.exp
diff -u src/usr.bin/make/unit-tests/shell-csh.exp:1.2 src/usr.bin/make/unit-tests/shell-csh.exp:1.3
--- src/usr.bin/make/unit-tests/shell-csh.exp:1.2	Sat Oct  3 15:21:12 2020
+++ src/usr.bin/make/unit-tests/shell-csh.exp	Sat Oct  3 15:23:42 2020
@@ -1,8 +1,10 @@
 echo normal
 normal
+se
 hidden
 echo always
 always
+se
 echo ignore errors
 ignore errors
 exit status 0
Index: src/usr.bin/make/unit-tests/shell-csh.mk
diff -u src/usr.bin/make/unit-tests/shell-csh.mk:1.2 src/usr.bin/make/unit-tests/shell-csh.mk:1.3
--- src/usr.bin/make/unit-tests/shell-csh.mk:1.2	Sat Oct  3 15:21:12 2020
+++ src/usr.bin/make/unit-tests/shell-csh.mk	Sat Oct  3 15:23:42 2020
@@ -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.

Reply via email to