diff options
author | Ron Yorston <rmy@pobox.com> | 2024-09-10 07:54:16 +0100 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2024-09-10 07:54:16 +0100 |
commit | b4d811aa232df8c7416a14f38a2396b028c35ac9 (patch) | |
tree | 7a5991fdb2e14f6de5f30ba6ec934a52e37b1afb /testsuite | |
parent | 074ebfca2153bf4a1fc6bdf4f3430d989de503c8 (diff) | |
download | busybox-w32-b4d811aa232df8c7416a14f38a2396b028c35ac9.tar.gz busybox-w32-b4d811aa232df8c7416a14f38a2396b028c35ac9.tar.bz2 busybox-w32-b4d811aa232df8c7416a14f38a2396b028c35ac9.zip |
make: reinstate conditional skipping of command lines
Commit e90345c10 (make: allow empty commands) rearranged readline()
in a way that broke the use of conditionals within the definition
of a rule.
Add a test case to detect this. Adjust readline() so that
conditionals are processed before returning command lines or
checking for empty lines and comments.
Remove the test for a leading tab in skip_lines(). This allows
conditionals in the definition of a rule to be indented with a
leading tab.
Diffstat (limited to 'testsuite')
-rwxr-xr-x | testsuite/make.tests | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/testsuite/make.tests b/testsuite/make.tests index c92c69340..a12e50b8b 100755 --- a/testsuite/make.tests +++ b/testsuite/make.tests | |||
@@ -652,6 +652,8 @@ B = b | |||
652 | target: | 652 | target: |
653 | ifeq ($(A),a) | 653 | ifeq ($(A),a) |
654 | @echo A OK | 654 | @echo A OK |
655 | else | ||
656 | @echo A not OK | ||
655 | endif | 657 | endif |
656 | ifneq "a" "$B" | 658 | ifneq "a" "$B" |
657 | @echo B OK | 659 | @echo B OK |