[src/trunk]: src/usr.bin/make/unit-tests make(1): add test for setting .OBJDI...

[rillig <rillig%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/77166a4a7d7d
branches:  trunk
changeset: 936538:77166a4a7d7d
user:      rillig <rillig%NetBSD.org@localhost>
date:      Tue Jul 28 22:44:44 2020 +0000

description:
make(1): add test for setting .OBJDIR via the command line

diffstat:

 distrib/sets/lists/tests/mi         |   4 +++-
 usr.bin/make/unit-tests/Makefile    |   3 ++-
 usr.bin/make/unit-tests/cmdline.exp |   5 +++++
 usr.bin/make/unit-tests/cmdline.mk  |  37 +++++++++++++++++++++++++++++++++++++
 4 files changed, 47 insertions(+), 2 deletions(-)

diffs (85 lines):

diff -r 38057627824a -r 77166a4a7d7d distrib/sets/lists/tests/mi
--- a/distrib/sets/lists/tests/mi       Tue Jul 28 21:38:15 2020 +0000
+++ b/distrib/sets/lists/tests/mi       Tue Jul 28 22:44:44 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.880 2020/07/27 20:46:18 rillig Exp $
+# $NetBSD: mi,v 1.881 2020/07/28 22:44:44 rillig Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -4524,6 +4524,8 @@
 ./usr/tests/usr.bin/make/unit-tests/Makefile   tests-usr.bin-tests     compattestfile,atf
 ./usr/tests/usr.bin/make/unit-tests/archive.exp        tests-usr.bin-tests     compattestfile,atf
 ./usr/tests/usr.bin/make/unit-tests/archive.mk tests-usr.bin-tests     compattestfile,atf
+./usr/tests/usr.bin/make/unit-tests/cmdline.exp        tests-usr.bin-tests     compattestfile,atf
+./usr/tests/usr.bin/make/unit-tests/cmdline.mk tests-usr.bin-tests     compattestfile,atf
 ./usr/tests/usr.bin/make/unit-tests/comment.exp        tests-usr.bin-tests     compattestfile,atf
 ./usr/tests/usr.bin/make/unit-tests/comment.mk tests-usr.bin-tests     compattestfile,atf
 ./usr/tests/usr.bin/make/unit-tests/cond-late.exp      tests-usr.bin-tests     compattestfile,atf
diff -r 38057627824a -r 77166a4a7d7d usr.bin/make/unit-tests/Makefile
--- a/usr.bin/make/unit-tests/Makefile  Tue Jul 28 21:38:15 2020 +0000
+++ b/usr.bin/make/unit-tests/Makefile  Tue Jul 28 22:44:44 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.74 2020/07/28 18:39:56 sjg Exp $
+# $NetBSD: Makefile,v 1.75 2020/07/28 22:44:44 rillig Exp $
 #
 # Unit tests for make(1)
 #
@@ -31,6 +31,7 @@
 # Each test is in a sub-makefile.
 # Keep the list sorted.
 TESTS+=                # archive       # broken on FreeBSD
+TESTS+=                cmdline
 TESTS+=                comment
 TESTS+=                cond-late
 TESTS+=                cond-short
diff -r 38057627824a -r 77166a4a7d7d usr.bin/make/unit-tests/cmdline.exp
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/usr.bin/make/unit-tests/cmdline.exp       Tue Jul 28 22:44:44 2020 +0000
@@ -0,0 +1,5 @@
+makeobjdir-direct:
+show-objdir: /tmp/6a8899d2-d227-4b55-9b6b-f3c8eeb83fd5
+makeobjdir-indirect:
+show-objdir: /tmp/a7b41170-53f8-4cc2-bc5c-e4c3dd93ec45/
+exit status 0
diff -r 38057627824a -r 77166a4a7d7d usr.bin/make/unit-tests/cmdline.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/usr.bin/make/unit-tests/cmdline.mk        Tue Jul 28 22:44:44 2020 +0000
@@ -0,0 +1,37 @@
+# $NetBSD: cmdline.mk,v 1.1 2020/07/28 22:44:44 rillig Exp $
+#
+# Tests for command line parsing and related special variables.
+
+RUN?=          @set -eu;
+TMPBASE?=      /tmp
+SUB1=          a7b41170-53f8-4cc2-bc5c-e4c3dd93ec45    # just a random UUID
+SUB2=          6a8899d2-d227-4b55-9b6b-f3c8eeb83fd5    # just a random UUID
+MAKE_CMD=      env TMPBASE=${TMPBASE}/${SUB1} ${.MAKE} -f ${MAKEFILE} -r
+DIR2=          ${TMPBASE}/${SUB2}
+DIR12=         ${TMPBASE}/${SUB1}/${SUB2}
+
+all: prepare-dirs
+all: makeobjdir-direct makeobjdir-indirect
+
+prepare-dirs:
+       ${RUN} rm -rf ${DIR2} ${DIR12}
+       ${RUN} mkdir -p ${DIR2} ${DIR12}
+
+# The .OBJDIR can be set via the MAKEOBJDIR command line variable.
+# It must be a command line variable; an environment variable would not work.
+makeobjdir-direct:
+       @echo $@:
+       ${RUN} ${MAKE_CMD} MAKEOBJDIR=${DIR2} show-objdir
+
+# The .OBJDIR can be set via the MAKEOBJDIR command line variable,
+# and that variable could even contain the usual modifiers.
+# Since the .OBJDIR=MAKEOBJDIR assignment happens very early,
+# the SUB2 variable in the modifier is not defined yet and is therefore empty.
+# The SUB1 in the resulting path comes from the environment variable TMPBASE,
+# see MAKE_CMD.
+makeobjdir-indirect:
+       @echo $@:
+       ${RUN} ${MAKE_CMD} MAKEOBJDIR='$${TMPBASE}/$${SUB2}' show-objdir
+
+show-objdir:
+       @echo $@: ${.OBJDIR:Q}