From 302da1a3d35c15cb29d76e0a939f8bcb13f7ad80 Mon Sep 17 00:00:00 2001
From: "Simon J. Gerraty" <sjg@FreeBSD.org>
Date: Sat, 7 Nov 2020 19:39:21 +0000
Subject: Import bmake-20201101

Lots of new unit-tests increase code coverage.

Lots of refactoring, cleanup and simlpification to reduce
code size.

Fixes for Bug 223564 and 245807

Updates to dirdeps.mk and meta2deps.py
---
 unit-tests/opt-debug-errors.mk | 42 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 unit-tests/opt-debug-errors.mk

(limited to 'unit-tests/opt-debug-errors.mk')

diff --git a/unit-tests/opt-debug-errors.mk b/unit-tests/opt-debug-errors.mk
new file mode 100644
index 000000000000..1658c6b3ce3e
--- /dev/null
+++ b/unit-tests/opt-debug-errors.mk
@@ -0,0 +1,42 @@
+# $NetBSD: opt-debug-errors.mk,v 1.2 2020/09/06 04:35:03 rillig Exp $
+#
+# Tests for the -de command line option, which adds debug logging for
+# failed commands and targets.
+
+.MAKEFLAGS: -de
+
+all: fail-spaces
+all: fail-escaped-space
+all: fail-newline
+all: fail-multiline
+all: fail-multiline-intention
+
+# XXX: The debug output folds the spaces, showing '3 spaces' instead of
+# the correct '3   spaces'.
+fail-spaces:
+	echo '3   spaces'; false
+
+# XXX: The debug output folds the spaces, showing 'echo \ indented' instead
+# of the correct 'echo \  indented'.
+fail-escaped-space:
+	echo \  indented; false
+
+# XXX: A newline is turned into an ordinary space in the debug log.
+fail-newline:
+	echo 'line1${.newline}line2'; false
+
+# The line continuations in multiline commands are turned into an ordinary
+# space before the command is actually run.
+fail-multiline:
+	echo 'line1\
+		line2'; false
+
+# It is a common style to align the continuation backslashes at the right
+# of the lines, usually at column 73.  All spaces before the continuation
+# backslash are preserved and are usually outside a shell word and thus
+# irrelevant.  Having these spaces collapsed makes sense to show the command
+# in its condensed form.
+#
+fail-multiline-intention:
+	echo	'word1'							\
+		'word2'; false
-- 
cgit v1.3