Module Name: src
Committed By: rillig
Date: Wed Feb 9 21:24:29 UTC 2022
Modified Files:
src/usr.bin/make/unit-tests: Makefile objdir-writable.mk
Log Message:
tests/make: remove redundant 'echo' from variable assignments
Before main.c 1.231 from 2014-09-09, a variable assignment using the
operator '!=' generated a warning "Couldn't read shell's output" if the
output of the command was empty. The simplest way to suppress this
wrong warning was to add an empty 'echo' to the command. This hack is
no longer needed.
To generate a diff of this commit:
cvs rdiff -u -r1.306 -r1.307 src/usr.bin/make/unit-tests/Makefile
cvs rdiff -u -r1.6 -r1.7 src/usr.bin/make/unit-tests/objdir-writable.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/Makefile
diff -u src/usr.bin/make/unit-tests/Makefile:1.306 src/usr.bin/make/unit-tests/Makefile:1.307
--- src/usr.bin/make/unit-tests/Makefile:1.306 Wed Feb 9 21:09:24 2022
+++ src/usr.bin/make/unit-tests/Makefile Wed Feb 9 21:24:29 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.306 2022/02/09 21:09:24 rillig Exp $
+# $NetBSD: Makefile,v 1.307 2022/02/09 21:24:29 rillig Exp $
#
# Unit tests for make(1)
#
@@ -653,7 +653,7 @@ TMPDIR:= /tmp/uid${.MAKE.UID}
.endif
# make sure it exists
.if !exist(${TMPDIR})
-x!= echo; mkdir -p ${TMPDIR}
+_!= mkdir -p ${TMPDIR}
.endif
MAKE_TEST_ENV= MALLOC_OPTIONS="JA" # for jemalloc 100
Index: src/usr.bin/make/unit-tests/objdir-writable.mk
diff -u src/usr.bin/make/unit-tests/objdir-writable.mk:1.6 src/usr.bin/make/unit-tests/objdir-writable.mk:1.7
--- src/usr.bin/make/unit-tests/objdir-writable.mk:1.6 Wed Feb 9 21:09:24 2022
+++ src/usr.bin/make/unit-tests/objdir-writable.mk Wed Feb 9 21:24:29 2022
@@ -1,4 +1,4 @@
-# $NetBSD: objdir-writable.mk,v 1.6 2022/02/09 21:09:24 rillig Exp $
+# $NetBSD: objdir-writable.mk,v 1.7 2022/02/09 21:24:29 rillig Exp $
# test checking for writable objdir
@@ -14,7 +14,8 @@ do-objdir:
all: no-objdir ro-objdir explicit-objdir
# make it now
-x!= echo; mkdir -p ${RO_OBJDIR}; chmod 555 ${RO_OBJDIR}
+_!= mkdir -p ${RO_OBJDIR}
+_!= chmod 555 ${RO_OBJDIR}
.END: rm-objdir
rm-objdir:
