 @@ -1,25 +1,26 @@
 #! /bin/sh
-# $NetBSD: subst.sh,v 1.33 2020/05/09 17:10:38 rillig Exp $
+# $NetBSD: subst.sh,v 1.34 2020/05/11 19:13:10 rillig Exp $
+#
 # Tests for mk/subst.mk.
+#
 set -eu
 . "./test.subr"
 test_case_set_up() {
-	rm -rf "$tmpdir"/.??* "$tmpdir"/*
+	wrkdir="$tmpdir/wrkdir"
 	mkdir "$wrkdir"
 	create_file "prepare-subst.mk" <<-EOF
 		# The tools that are used by subst.mk
 		AWK=		awk
 		CHMOD=		chmod
 		CMP=		cmp
 		DIFF=		diff
 		ECHO=		echo
 		MKDIR=		mkdir -p
 		MV=		mv
 		RM=		rm
 		RMDIR=		rmdir
 		SED=		sed
 @@ -27,83 +28,91 @@ test_case_set_up() {
 		TOUCH=		touch
 		TOUCH_FLAGS=	# none
 		TR=		tr
 		TRUE=		true
 		# Commands that are specific to pkgsrc
 		RUN=		@set -e;
 		STEP_MSG=	echo "=>"
 		DO_NADA=	: do-nada
 		INFO_MSG=	echo "info:"
 		WARNING_MSG=	echo "warning:"
 		FAIL_MSG=	sh $pkgsrcdir/mk/scripts/fail echo "fail:"
-		WRKDIR=		$tmpdir
+		WRKDIR=		$tmpdir/wrkdir
-		WRKSRC=		$tmpdir
+		WRKSRC=		.
 	EOF
+}
 test_case_tear_down() {
 	# Clean up the .subst_*_done cookie files.
 	rm -r "$wrkdir"
+}
 if test_case_begin "single file"; then
 	# A single file is patched successfully.
 	create_file "subst-single.mk" <<-EOF
 		SUBST_CLASSES+=		class
 		SUBST_STAGE.class=	pre-configure
 		SUBST_FILES.class=	subst-single.txt
 		SUBST_SED.class=	-e 's,before,after,'
 		.include "prepare-subst.mk"
 		.include "mk/subst.mk"
 		all: subst-class
 	EOF
 	create_file_lines "subst-single.txt" \
 		"before"
 	run_bmake "subst-single.mk" > "$tmpdir/output"
-	assert_that "output" --file-contains-exactly "=> Substituting \"class\" in subst-single.txt"
+	assert_that "$tmpdir/output" --file-contains-exactly \
-	assert_that "subst-single.txt" --file-contains-exactly "after"
+		"=> Substituting \"class\" in subst-single.txt"
 	assert_that "subst-single.txt" --file-contains-exactly \
 		"after"
 	test_case_end
 fi
 if test_case_begin "several individual files"; then
 	# Several individual files are patched successfully.
 	create_file "testcase.mk" <<-EOF
 		SUBST_CLASSES+=		class
 		SUBST_STAGE.class=	pre-configure
 		SUBST_FILES.class=	first second third
 		SUBST_SED.class=	-e 's,file,example,'
 		.include "prepare-subst.mk"
 		.include "mk/subst.mk"
 		all: subst-class
 	EOF
 	create_file_lines "first"	"the first file"
 	create_file_lines "second"	"the second file"
 	create_file_lines "third"	"the third file"
-	output=$(run_bmake "testcase.mk")
+	run_bmake "testcase.mk" > "$tmpdir/output"
-	assert_that "$output" --equals "=> Substituting \"class\" in first second third"
+	assert_that "$tmpdir/output" --file-is-lines \
 		"=> Substituting \"class\" in first second third"
 	assert_that "first" --file-contains-exactly "the first example"
 	assert_that "second" --file-contains-exactly "the second example"
 	assert_that "third" --file-contains-exactly "the third example"
 	test_case_end
 fi
 if test_case_begin "several files by pattern"; then
 	# Several files are patched successfully.
 	# The filenames are given by a pattern.
 @@ -149,242 +158,243 @@ if test_case_begin "pattern with 1 noop"
 		SUBST_FILES.class=	pattern-*
 		SUBST_SED.class=	-e 's,file,example,'
 		.include "prepare-subst.mk"
 		.include "mk/subst.mk"
 		all: subst-class
 	EOF
 	create_file_lines "pattern-first"	"the first file"
 	create_file_lines "pattern-second"	"the second is already an example"
 	create_file_lines "pattern-third"	"the third file"
-	run_bmake "testcase.mk" > "$tmpdir/actual-output"
+	run_bmake "testcase.mk" > "$tmpdir/output"
 	create_file_lines "expected-output" \
 		'=> Substituting "class" in pattern-*' \
 		'info: [subst.mk:class] Nothing changed in "pattern-second".'
-	assert_that "actual-output" --file-equals "expected-output"
+	assert_that "$tmpdir/output" --file-equals "expected-output"
 	assert_that "pattern-first" --file-contains-exactly "the first example"
 	assert_that "pattern-second" --file-contains-exactly "the second is already an example"
 	assert_that "pattern-third" --file-contains-exactly "the third example"
 	test_case_end
 fi
 if test_case_begin "single file noop, noop_ok=yes"; then
 	create_file "testcase.mk" <<-EOF
 		SUBST_CLASSES+=		class
 		SUBST_STAGE.class=	pre-configure
 		SUBST_FILES.class=	single
 		SUBST_SED.class=	-e 's,file,example,'
 		SUBST_NOOP_OK.class=	yes
 		.include "prepare-subst.mk"
 		.include "mk/subst.mk"
 		all: subst-class
 	EOF
 	create_file_lines "single"	"already an example"
-	run_bmake "testcase.mk" > "$tmpdir/actual-output" && exitcode=0 || exitcode=$?
+	run_bmake "testcase.mk" > "$tmpdir/output" \
 	&& exitcode=0 || exitcode=$?
-	create_file_lines "expected-output" \
+	assert_that "$tmpdir/output" --file-is-lines \
 		'=> Substituting "class" in single' \
 		'info: [subst.mk:class] Nothing changed in "single".'
 	assert_that "actual-output" --file-equals "expected-output"
 	assert_that "single" --file-contains-exactly "already an example"
 	assert_that "$exitcode" --equals "0"
 	test_case_end
 fi
 if test_case_begin "single file noop, noop_ok=no"; then
 	create_file "testcase.mk" <<-EOF
 		SUBST_CLASSES+=		class
 		SUBST_STAGE.class=	pre-configure
 		SUBST_FILES.class=	single
 		SUBST_SED.class=	-e 's,file,example,'
 		SUBST_NOOP_OK.class=	no
 		.include "prepare-subst.mk"
 		.include "mk/subst.mk"
 		all: subst-class
 	EOF
 	create_file_lines "single"	"already an example"
-	run_bmake "testcase.mk" > "$tmpdir/actual-output" && exitcode=0 || exitcode=$?
+	run_bmake "testcase.mk" > "$tmpdir/output" \
 	&& exitcode=0 || exitcode=$?
 	create_file_lines "expected-output" \
 		'=> Substituting "class" in single' \
 		'warning: [subst.mk:class] Nothing changed in "single".' \
 		'fail: [subst.mk:class] The filename pattern "single" has no effect.' \
 		'*** Error code 1' \
 		'' \
 		'Stop.' \
 		"$make: stopped in $PWD"
-	assert_that "actual-output" --file-equals "expected-output"
+	assert_that "$tmpdir/output" --file-equals "expected-output"
 	assert_that "single" --file-contains-exactly "already an example"
 	assert_that "$exitcode" --equals "1"
 	test_case_end
 fi
 if test_case_begin "single file nonexistent"; then
 	create_file "testcase.mk" <<-EOF
 		SUBST_CLASSES+=		class
 		SUBST_STAGE.class=	pre-configure
 		SUBST_FILES.class=	nonexistent
 		SUBST_SED.class=	-e 's,file,example,'
 		SUBST_NOOP_OK.class=	no
 		.include "prepare-subst.mk"
 		.include "mk/subst.mk"
 		all: subst-class
 	EOF
-	run_bmake "testcase.mk" > "$tmpdir/actual-output" && exitcode=0 || exitcode=$?
+	run_bmake "testcase.mk" > "$tmpdir/output" \
 	&& exitcode=0 || exitcode=$?
-	create_file_lines "expected-output" \
+	assert_that "$tmpdir/output" --file-is-lines \
 		'=> Substituting "class" in nonexistent' \
 		'warning: [subst.mk:class] Ignoring nonexistent file "nonexistent".' \
 		'fail: [subst.mk:class] The filename pattern "nonexistent" has no effect.' \
 		'*** Error code 1' \
 		'' \
 		'Stop.' \
 		"$make: stopped in $PWD"
 	assert_that "actual-output" --file-equals "expected-output"
 	assert_that "$exitcode" --equals "1"
 	test_case_end
 fi
 if test_case_begin "single file nonexistent ok"; then
 	create_file "testcase.mk" <<-EOF
 		SUBST_CLASSES+=		class
 		SUBST_STAGE.class=	pre-configure
 		SUBST_FILES.class=	nonexistent
 		SUBST_SED.class=	-e 's,file,example,'
 		SUBST_NOOP_OK.class=	yes
 		.include "prepare-subst.mk"
 		.include "mk/subst.mk"
 		all: subst-class
 	EOF
-	run_bmake "testcase.mk" > "$tmpdir/actual-output" && exitcode=0 || exitcode=$?
+	run_bmake "testcase.mk" > "$tmpdir/output" \
 	&& exitcode=0 || exitcode=$?
-	create_file_lines "expected-output" \
+	assert_that "$tmpdir/output" --file-is-lines \
 		'=> Substituting "class" in nonexistent' \
 		'info: [subst.mk:class] Ignoring nonexistent file "nonexistent".'
 	assert_that "actual-output" --file-equals "expected-output"
 	assert_that "$exitcode" --equals "0"
 	test_case_end
 fi
 if test_case_begin "several patterns, 1 nonexistent"; then
 	create_file "testcase.mk" <<-EOF
 		SUBST_CLASSES+=		class
 		SUBST_STAGE.class=	pre-configure
 		SUBST_FILES.class=	*exist* *not-found*
 		SUBST_SED.class=	-e 's,file,example,'
 		.include "prepare-subst.mk"
 		.include "mk/subst.mk"
 		all: subst-class
 	EOF
 	create_file_lines "exists"	"this file exists"
-	run_bmake "testcase.mk" > "$tmpdir/actual-output" && exitcode=0 || exitcode=$?
+	run_bmake "testcase.mk" > "$tmpdir/output" \
 	&& exitcode=0 || exitcode=$?
-	create_file_lines "expected-output" \
+	assert_that "$tmpdir/output" --file-is-lines \
 		'=> Substituting "class" in *exist* *not-found*' \
 		'info: [subst.mk:class] Ignoring nonexistent file "./*not-found*".'
 	assert_that "actual-output" --file-equals "expected-output"
 	assert_that "exists" --file-contains-exactly "this example exists"
 	assert_that "$exitcode" --equals "0"
 	test_case_end
 fi
 if test_case_begin "multiple missing files, all are reported at once"; then
 	create_file "testcase.mk" <<-EOF
 		SUBST_CLASSES+=		class
 		SUBST_STAGE.class=	pre-configure
 		SUBST_FILES.class=	does not exist
 		SUBST_SED.class=	-e 'sahara'
 		.include "prepare-subst.mk"
 		.include "mk/subst.mk"
 	EOF
-	run_bmake "testcase.mk" > "$tmpdir/actual-output" && exitcode=0 || exitcode=$?
+	run_bmake "testcase.mk" > "$tmpdir/output" \
 	&& exitcode=0 || exitcode=$?
-	create_file_lines "expected-output" \
+	assert_that "$tmpdir/output" --file-is-lines \
 		'=> Substituting "class" in does not exist' \
 		'info: [subst.mk:class] Ignoring nonexistent file "does".' \
 		'info: [subst.mk:class] Ignoring nonexistent file "not".' \
 		'info: [subst.mk:class] Ignoring nonexistent file "exist".'
 	assert_that "actual-output" --file-equals "expected-output"
 	assert_that "$exitcode" --equals "0"
 	test_case_end
 fi
 if test_case_begin "multiple no-op files, all are reported at once"; then
 	create_file "testcase.mk" <<-EOF
 		SUBST_CLASSES+=		class
 		SUBST_STAGE.class=	pre-configure
 		SUBST_FILES.class=	first second third
 		SUBST_SED.class=	-e 's,from,to,'
 		.include "prepare-subst.mk"
 		.include "mk/subst.mk"
 	EOF
 	create_file_lines "first"	"text"
 	create_file_lines "second"	"second"
 	create_file_lines "third"	"third"
-	run_bmake "testcase.mk" > "$tmpdir/actual-output" && exitcode=0 || exitcode=$?
+	run_bmake "testcase.mk" > "$tmpdir/output" \
 	&& exitcode=0 || exitcode=$?
-	create_file_lines "expected-output" \
+	assert_that "$tmpdir/output" --file-is-lines \
 		'=> Substituting "class" in first second third' \
 		'info: [subst.mk:class] Nothing changed in "first".' \
 		'info: [subst.mk:class] Nothing changed in "second".' \
 		'info: [subst.mk:class] Nothing changed in "third".'
 	assert_that "actual-output" --file-equals "expected-output"
 	assert_that "$exitcode" --equals "0"
 	test_case_end
 fi
 if test_case_begin "late evaluation of SUBST_FILES"; then
 	# Ensure that SUBST_FILES is evaluated as late as possible.
 	# Evaluating it early breaks cases like pkglocaledir where the
 	# list of files is generated by a shell command.
 	# See mk/configure/replace-localedir.mk.
 @@ -403,37 +413,36 @@ WRKSRC=		\${WRKDIR}/package-1.0
 .include "mk/subst.mk"
 # It is tricky that the dependency must use an internal implementation
 # detail, but that's the only way to guarantee the correct ordering.
 \${_SUBST_COOKIE.class}: prepare-subst-class
 prepare-subst-class:
 	\${RUN} \${MKDIR} \${WRKSRC}
 	\${RUN} \${ECHO} "from" > "\${WRKSRC}/first"
 	\${RUN} \${ECHO} "from" > "\${WRKSRC}/second"
 	\${RUN} \${ECHO} "from" > "\${WRKSRC}/third"
 EOF
 	run_bmake "testcase.mk" "subst-class" \
-> "$tmpdir/actual-output" \
+> "$tmpdir/stdout" \
-> "$tmpdir/actual-stderr" \
+> "$tmpdir/stderr" \
 	&& exitcode=0 || exitcode=$?
-	create_file_lines "expected-output" \
+	assert_that "$tmpdir/stdout" --file-is-lines \
 		'=> Substituting "class" in first third'
-	assert_that "actual-output" --file-equals "expected-output"
+	assert_that "$tmpdir/stderr" --file-is-empty
-	assert_that "actual-stderr" --file-is-empty
+	assert_that "$wrkdir/package-1.0/first" --file-contains-exactly "to"
-	assert_that "package-1.0/first" --file-contains-exactly "to"
+	assert_that "$wrkdir/package-1.0/second" --file-contains-exactly "from"
-	assert_that "package-1.0/second" --file-contains-exactly "from"
+	assert_that "$wrkdir/package-1.0/third" --file-contains-exactly "to"
 	assert_that "package-1.0/third" --file-contains-exactly "to"
 	assert_that "$exitcode" --equals "0"
 	test_case_end
 fi
 if test_case_begin "special characters in filenames"; then
 	create_file "testcase.mk" <<-EOF
 		SUBST_CLASSES+=		class
 		SUBST_STAGE.class=	pre-configure
 		SUBST_FILES.class=	*
 		SUBST_SED.class=	-e s,before,after,
 @@ -447,33 +456,30 @@ if test_case_begin "special characters i
 	create_file_lines "0123456789:;<=>?"	"before"
 	create_file_lines "@ABCDEFGHIJKLMNO"	"before"
 	create_file_lines "PQRSTUVWXYZ[\\]^_"	"before"
 	create_file_lines "\`abcdefghijklmno"	"before"
 	create_file_lines "pqrstuvwxyz{|}~"	"before"
 	create_file_lines "--no-option"		"before"
 	create_file_lines ".hidden"		"before"
 	run_bmake "testcase.mk" "subst-class" \
 > "$tmpdir/stdout" \
 > "$tmpdir/stderr" \
 	&& exitcode=0 || exitcode=$?
-	assert_that "stdout" --file-is-lines \
+	assert_that "$tmpdir/stdout" --file-is-lines \
 		'=> Substituting "class" in *' \
-		'info: [subst.mk:class] Nothing changed in "prepare-subst.mk".' \
+		'info: [subst.mk:class] Nothing changed in "prepare-subst.mk".'
-		'info: [subst.mk:class] Nothing changed in "stderr".' \
+	assert_that "$tmpdir/stderr" --file-is-empty
 		'info: [subst.mk:class] Nothing changed in "stdout".' \
 		'info: [subst.mk:class] Nothing changed in "test.subr.main.mk".'
 	assert_that "stderr" --file-is-empty
 	assert_that "$exitcode" --equals "0"
 	assert_that " !\"#\$%&'()*+,-."	--file-is-lines "after"
 	assert_that "0123456789:;<=>?"	--file-is-lines "after"
 	assert_that "@ABCDEFGHIJKLMNO"	--file-is-lines "after"
 	assert_that "PQRSTUVWXYZ[\\]^_"	--file-is-lines "after"
 	assert_that "\`abcdefghijklmno"	--file-is-lines "after"
 	assert_that "pqrstuvwxyz{|}~"	--file-is-lines "after"
 	assert_that "--no-option"	--file-is-lines "after"
 	assert_that ".hidden"		--file-is-lines "before"
 	test_case_end
 fi
 @@ -491,29 +497,29 @@ if test_case_begin "brackets in filename
 		.include "mk/subst.mk"
 	EOF
 	create_file_lines "any"	"before"
 	create_file_lines "x"	"before"
 	create_file_lines "*"	"before"
 	create_file_lines "[*]"	"before"
 	run_bmake "testcase.mk" "subst-class" \
 > "$tmpdir/stdout" \
 > "$tmpdir/stderr" \
 	&& exitcode=0 || exitcode=$?
-	assert_that "stdout" --file-is-lines \
+	assert_that "$tmpdir/stdout" --file-is-lines \
 		'=> Substituting "class" in [*]'
-	assert_that "stderr" --file-is-empty
+	assert_that "$tmpdir/stderr" --file-is-empty
 	assert_that "$exitcode" --equals "0"
 	assert_that "any"	--file-is-lines "before"
 	assert_that "x"		--file-is-lines "before"
 	assert_that "*"		--file-is-lines "after"
 	assert_that "[*]"	--file-is-lines "before"
 	test_case_end
 fi
 if test_case_begin "duplicate SUBST class"; then
 @@ -524,28 +530,28 @@ SUBST_CLASSES+=		one
 all:
 	@printf 'fail reason: %s\n' \${PKG_FAIL_REASON} 1>&2
 .include "prepare-subst.mk"
 .include "mk/subst.mk"
 EOF
 	run_bmake "testcase.mk" "all" \
 > "$tmpdir/stdout" \
 > "$tmpdir/stderr" \
 	&& exitcode=0 || exitcode=$?
-	assert_that "stdout" --file-is-empty
+	assert_that "$tmpdir/stdout" --file-is-empty
-	assert_that "stderr" --file-is-lines \
+	assert_that "$tmpdir/stderr" --file-is-lines \
 		"fail reason: [subst.mk] duplicate SUBST class in: one one two"
 	assert_that "$exitcode" --equals 0
 	test_case_end
 fi
 if test_case_begin "several SUBST classes"; then
 	# It's ok to have several SUBST classes that apply to the same file.
 	# The order of execution is not guaranteed though.
 	create_file_lines "file" "zero one two three four"
 @@ -569,31 +575,31 @@ if test_case_begin "several SUBST classe
 		.include "prepare-subst.mk"
 		.include "mk/subst.mk"
 	EOF
 	run_bmake "testcase.mk" "pre-configure" \
 > "$tmpdir/stdout" \
 > "$tmpdir/stderr" \
 	&& exitcode=0 || exitcode=$?
 	# The order of the above output is not guaranteed.
 	LC_ALL=C sort < "$tmpdir/stdout" > "$tmpdir/stdout-sorted"
 	assert_that "file" --file-is-lines "zero I II III four"
-	assert_that "stdout-sorted" --file-is-lines \
+	assert_that "$tmpdir/stdout-sorted" --file-is-lines \
 		"=> Substituting \"one\" in file" \
 		"=> Substituting \"three\" in file" \
 		"=> Substituting \"two\" in file"
-	assert_that "stderr" --file-is-empty
+	assert_that "$tmpdir/stderr" --file-is-empty
 	assert_that "$exitcode" --equals 0
 	test_case_end
 fi
 if test_case_begin "show diff"; then
 	create_file_lines "file" "one" "two" "three"
 	create_file "testcase.mk" <<-EOF
 		SUBST_CLASSES+=		two
 		SUBST_STAGE.two=	pre-configure
 @@ -605,36 +611,36 @@ if test_case_begin "show diff"; then
 		.include "mk/subst.mk"
 	EOF
 	LC_ALL=C \
 	run_bmake "testcase.mk" "pre-configure" \
 > "$tmpdir/stdout" \
 > "$tmpdir/stderr" \
 	&& exitcode=0 || exitcode=$?
 	awk '{ if (/^(---|\+\+\+) /) { print $1 " " $2 " (filtered timestamp)" } else { print $0 } }' \
 	< "$tmpdir/stdout" > "$tmpdir/stdout-filtered"
 	assert_that "file" --file-is-lines "one" "II" "three"
-	assert_that "stdout-filtered" --file-is-lines \
+	assert_that "$tmpdir/stdout-filtered" --file-is-lines \
 		"=> Substituting \"two\" in file" \
 		"--- file (filtered timestamp)" \
 		"+++ file.subst.sav (filtered timestamp)" \
 		"@@ -1,3 +1,3 @@" \
 		" one" \
 		"-two" \
 		"+II" \
 		" three"
-	assert_that "stderr" --file-is-empty
+	assert_that "$tmpdir/stderr" --file-is-empty
 	assert_that "$exitcode" --equals 0
 	test_case_end
 fi
 if test_case_begin "global show diff"; then
 	create_file_lines "file" "one" "two" "three"
 	create_file "testcase.mk" <<-EOF
 		SUBST_CLASSES+=		two
 		SUBST_STAGE.two=	pre-configure
 @@ -645,36 +651,36 @@ if test_case_begin "global show diff"; t
 		.include "prepare-subst.mk"
 		.include "mk/subst.mk"
 	EOF
 	run_bmake "testcase.mk" "pre-configure" \
 > "$tmpdir/stdout" \
 > "$tmpdir/stderr" \
 	&& exitcode=0 || exitcode=$?
 	awk '{ if (/^(---|\+\+\+) /) { print $1 " " $2 " (filtered timestamp)" } else { print $0 } }' \
 	< "$tmpdir/stdout" > "$tmpdir/stdout-filtered"
 	assert_that "file" --file-is-lines "one" "II" "three"
-	assert_that "stdout-filtered" --file-is-lines \
+	assert_that "$tmpdir/stdout-filtered" --file-is-lines \
 		"=> Substituting \"two\" in file" \
 		"--- file (filtered timestamp)" \
 		"+++ file.subst.sav (filtered timestamp)" \
 		"@@ -1,3 +1,3 @@" \
 		" one" \
 		"-two" \
 		"+II" \
 		" three"
-	assert_that "stderr" --file-is-empty
+	assert_that "$tmpdir/stderr" --file-is-empty
 	assert_that "$exitcode" --equals 0
 	test_case_end
 fi
 if test_case_begin "SUBST_VARS"; then
 	create_file_lines "testcase.mk" \
 		'SUBST_CLASSES+=	vars' \
 		'SUBST_STAGE.vars=	pre-configure' \
 		'SUBST_FILES.vars=	vars.txt' \
 		'SUBST_VARS.vars=	PLAIN DQUOT SQUOT DELIM PRINTABLE' \
 @@ -702,29 +708,29 @@ if test_case_begin "SUBST_VARS"; then
 > "$tmpdir/stderr" \
 	&& exitcode=0 || exitcode=$?
 	# The double quotes and single quotes are kept since the variables
 	# are treated as simple string variables, not as lists of shell
 	# words. In these string variables, the quotes are part of the value.
 	assert_that "vars.txt" --file-is-lines \
 		"plain" \
 		"\"double   quoted\"" \
 		"'single   quoted'" \
 		"hello,   world" \
 		'!"#$%&'\''()*+,-./09:;<=>?@AZ[\]^_`az{|}' \
 		""
-	assert_that "stdout" --file-is-lines \
+	assert_that "$tmpdir/stdout" --file-is-lines \
 		"=> Substituting \"vars\" in vars.txt"
-	assert_that "stderr" --file-is-empty
+	assert_that "$tmpdir/stderr" --file-is-empty
 	assert_that "$exitcode" --equals 0
 	test_case_end
 fi
 if test_case_begin "SUBST_VARS with surrounding whitespace"; then
 	# Ensure that leading and trailing whitespace is preserved
 	# in the variable values.
 	create_file_lines "testcase.mk" \
 		'SUBST_CLASSES+=	vars' \
 		'SUBST_STAGE.vars=	pre-configure' \
 @@ -745,29 +751,29 @@ if test_case_begin "SUBST_VARS with surr
 	run_bmake "testcase.mk" "pre-configure" \
 > "$tmpdir/stdout" \
 > "$tmpdir/stderr" \
 	&& exitcode=0 || exitcode=$?
 	space=' '
 	tab='	'
 	newline='
+'
 	assert_that "vars.txt" --file-is-lines \
 		"$space""between spaces""$space" \
 		"$tab""between tabs""$tab" \
 		"$newline""between newlines""$newline"
-	assert_that "stdout" --file-is-lines \
+	assert_that "$tmpdir/stdout" --file-is-lines \
 		"=> Substituting \"vars\" in vars.txt"
-	assert_that "stderr" --file-is-empty
+	assert_that "$tmpdir/stderr" --file-is-empty
 	assert_that "$exitcode" --equals 0
 	test_case_end
 fi
 if test_case_begin "SUBST_VARS with backslashes"; then
 	create_file_lines "testcase.mk" \
 		'SUBST_CLASSES+=	bs' \
 		'SUBST_STAGE.bs=	pre-configure' \
 		'SUBST_FILES.bs=	backslash.txt' \
 		'SUBST_VARS.bs=		BACKSLASHES' \
 @@ -775,29 +781,29 @@ if test_case_begin "SUBST_VARS with back
 		'BACKSLASHES=	\" \, \\, \" \'\'' \0\000 \x40 \089 \a \$$' \
 		'' \
 		'.include "prepare-subst.mk"' \
 		'.include "mk/subst.mk"'
 	create_file_lines "backslash.txt" "@BACKSLASHES@"
 	run_bmake "testcase.mk" "pre-configure" \
 > "$tmpdir/stdout" \
 > "$tmpdir/stderr" \
 	&& exitcode=0 || exitcode=$?
 	assert_that "backslash.txt" --file-is-lines \
 		'\" \, \\, \" \'\'' \0\000 \x40 \089 \a \$'
-	assert_that "stdout" --file-is-lines \
+	assert_that "$tmpdir/stdout" --file-is-lines \
 		"=> Substituting \"bs\" in backslash.txt"
-	assert_that "stderr" --file-is-empty
+	assert_that "$tmpdir/stderr" --file-is-empty
 	assert_that "$exitcode" --equals 0
 	test_case_end
 fi
 if test_case_begin "SUBST_VARS for variables with regex characters"; then
 	# Ensure that special regex characters like dots and parentheses
 	# may appear in variable names and are properly escaped.
 	# Variable names containing a dollar are not supported.
 	# Bmake behaves very surprisingly when a $ is expanded inside a :C
 @@ -840,139 +846,137 @@ if test_case_begin "SUBST_VARS for varia
 > "$tmpdir/stdout" \
 > "$tmpdir/stderr" \
 	&& exitcode=0 || exitcode=$?
 	assert_that "vars.txt" --file-is-lines \
 		"dots" \
 		"letters" \
 		"parentheses" \
 		"angle brackets" \
 		"square brackets" \
 		'@VAR.$x@' \
 		'circumflex' \
 		'backslash'
-	assert_that "stdout" --file-is-lines \
+	assert_that "$tmpdir/stdout" --file-is-lines \
 		"=> Substituting \"vars\" in vars.txt"
-	assert_that "stderr" --file-is-empty
+	assert_that "$tmpdir/stderr" --file-is-empty
 	assert_that "$exitcode" --equals 0
 	test_case_end
 fi
 if test_case_begin "pattern matches directory"; then
 	# When a pattern matches a directory, that directory is silently
 	# skipped.
+	#
 	# In this test case, the pattern also matches a regular file that
 	# is actually modified. Therefore the pattern has an effect, and
 	# there is no error message.
 	create_file_lines "testcase.mk" \
 		'SUBST_CLASSES+=	dir' \
 		'SUBST_STAGE.dir=	pre-configure' \
 		'SUBST_FILES.dir=	sub*' \
 		'SUBST_VARS.dir=	VAR' \
 		'SUBST_NOOP_OK.dir=	no' \
 		'' \
 		'VAR=			value' \
 		'' \
 		'.include "prepare-subst.mk"' \
 		'.include "mk/subst.mk"'
 	mkdir "$tmpdir/subdir"
 	create_file_lines "subdir/subfile" \
 		"@VAR@"
 	create_file_lines "subst-file" \
 		"@VAR@"
 	run_bmake "testcase.mk" "pre-configure" \
 > "$tmpdir/stdout" \
 > "$tmpdir/stderr" \
 	&& exitcode=0 || exitcode=$?
 	assert_that "subst-file" --file-is-lines "value"
 	assert_that "subdir/subfile" --file-is-lines "@VAR@" # unchanged
-	assert_that "stdout" --file-is-lines \
+	assert_that "$tmpdir/stdout" --file-is-lines \
 		"=> Substituting \"dir\" in sub*"
-	assert_that "stderr" --file-is-empty
+	assert_that "$tmpdir/stderr" --file-is-empty
 	assert_that "$exitcode" --equals 0
 	test_case_end
 fi
 if test_case_begin "pattern matches only directory"; then
 	# When a pattern matches a directory, that directory is silently
 	# skipped.
 	create_file_lines "testcase.mk" \
 		'SUBST_CLASSES+=	dir' \
 		'SUBST_STAGE.dir=	pre-configure' \
 		'SUBST_FILES.dir=	sub*' \
 		'SUBST_VARS.dir=	VAR' \
 		'SUBST_NOOP_OK.dir=	no' \
 		'' \
 		'VAR=			value' \
 		'' \
 		'.include "prepare-subst.mk"' \
 		'.include "mk/subst.mk"'
 	mkdir "$tmpdir/subdir"
 	create_file_lines "subdir/subfile" \
 		"@VAR@"
 	run_bmake "testcase.mk" "pre-configure" \
 > "$tmpdir/stdout" \
 > "$tmpdir/stderr" \
 	&& exitcode=0 || exitcode=$?
 	assert_that "subdir/subfile" --file-is-lines "@VAR@" # unchanged
-	assert_that "stdout" --file-is-lines \
+	assert_that "$tmpdir/stdout" --file-is-lines \
 		"=> Substituting \"dir\" in sub*" \
 		'fail: [subst.mk:dir] The filename pattern "sub*" has no effect.' \
 		"*** Error code 1" \
 		"" \
 		"Stop." \
 		"$make: stopped in $PWD"
-	assert_that "stderr" --file-is-empty
+	assert_that "$tmpdir/stderr" --file-is-empty
 	assert_that "$exitcode" --equals 1
 	test_case_end
 fi
 if test_case_begin "two filename patterns have no effect"; then
 	# All patterns of SUBST_FILES should be applied before erroring out,
 	# to give a complete picture of the situation.
 	create_file_lines "testcase.mk" \
 		'SUBST_CLASSES+=	id' \
 		'SUBST_STAGE.id=	pre-configure' \
 		'SUBST_FILES.id=	file1 file2' \
 		'SUBST_VARS.id=		A B' \
 		'SUBST_NOOP_OK.id=	no' \
 		'A=			a-value' \
 		'B=			b-value' \
 		'' \
 		'.include "prepare-subst.mk"' \
 		'.include "mk/subst.mk"'
 	create_file_lines "file1"	"nothing to replace"
 	create_file_lines "file2"	"nothing to replace"
-	run_bmake "testcase.mk" "pre-configure" 1> "$tmpdir/out" 2>&1 \
+	run_bmake "testcase.mk" "pre-configure" 1> "$tmpdir/output" 2>&1 \
 	&& exitcode=0 || exitcode=$?
-	assert_that "out" --file-is-lines \
+	assert_that "$tmpdir/output" --file-is-lines \
 		'=> Substituting "id" in file1 file2' \
 		'warning: [subst.mk:id] Nothing changed in "file1".' \
 		'warning: [subst.mk:id] Nothing changed in "file2".' \
 		'fail: [subst.mk:id] The filename patterns "file1 file2" have no effect.' \
 		'*** Error code 1' \
 		'' \
 		'Stop.' \
 		"$make: stopped in $PWD"
 	test_case_end
 fi
 @@ -984,56 +988,56 @@ if test_case_begin "empty SUBST_FILES";
 	create_file_lines "testcase.mk" \
 		'SUBST_CLASSES+=	id' \
 		'SUBST_STAGE.id=	pre-configure' \
 		'SUBST_FILES.id=	# none' \
 		'SUBST_SED.id=		-e s,from,to,' \
 		'SUBST_NOOP_OK.id=	no' \
 		'' \
 		'all:' \
 		'	@printf "%s\n" ${PKG_FAIL_REASON:Uok}' \
 		'' \
 		'.include "prepare-subst.mk"' \
 		'.include "mk/subst.mk"'
-	run_bmake "testcase.mk" "pre-configure" "all" 1> "$tmpdir/out" 2>&1 \
+	run_bmake "testcase.mk" "pre-configure" "all" 1> "$tmpdir/output" 2>&1 \
 	&& exitcode=0 || exitcode=$?
-	assert_that "out" --file-is-lines \
+	assert_that "$tmpdir/output" --file-is-lines \
 		'=> Substituting "id" in ' \
 		'ok'
 	test_case_end
 fi
 if test_case_begin "empty SUBST_SED"; then
 	create_file_lines "testcase.mk" \
 		'SUBST_CLASSES+=	id' \
 		'SUBST_STAGE.id=	pre-configure' \
 		'SUBST_FILES.id=	file' \
 		'SUBST_SED.id=		# none' \
 		'SUBST_NOOP_OK.id=	no' \
 		'' \
 		'all:' \
 		'	@printf "%s\n" ${PKG_FAIL_REASON:Uok}' \
 		'' \
 		'.include "prepare-subst.mk"' \
 		'.include "mk/subst.mk"'
-	run_bmake "testcase.mk" "pre-configure" "all" 1> "$tmpdir/out" 2>&1 \
+	run_bmake "testcase.mk" "pre-configure" "all" 1> "$tmpdir/output" 2>&1 \
 	&& exitcode=0 || exitcode=$?
-	assert_that "out" --file-is-lines \
+	assert_that "$tmpdir/output" --file-is-lines \
 		'=> Substituting "id" in file' \
 		'warning: [subst.mk:id] Ignoring nonexistent file "file".' \
 		'fail: [subst.mk:id] The filename pattern "file" has no effect.' \
 		'*** Error code 1' \
 		'' \
 		'Stop.' \
 		"$make: stopped in $PWD"
 	test_case_end
 fi
 if test_case_begin "typo in SUBST_CLASSES"; then
 @@ -1044,30 +1048,30 @@ if test_case_begin "typo in SUBST_CLASSE
 	create_file_lines "testcase.mk" \
 		'SUBST_CLASSES=+	id' \
 		'SUBST_STAGE.id=	pre-configure' \
 		'SUBST_FILES.id=	file' \
 		'SUBST_SED.id=		# none' \
 		'SUBST_NOOP_OK.id=	no' \
 		'' \
 		'all:' \
 		'	@printf "%s\n" ${PKG_FAIL_REASON:Uok}' \
 		'' \
 		'.include "prepare-subst.mk"' \
 		'.include "mk/subst.mk"'
-	run_bmake "testcase.mk" "pre-configure" "all" 1> "$tmpdir/out" 2>&1 \
+	run_bmake "testcase.mk" "pre-configure" "all" 1> "$tmpdir/output" 2>&1 \
 	&& exitcode=0 || exitcode=$?
-	assert_that "out" --file-is-lines \
+	assert_that "$tmpdir/output" --file-is-lines \
 		'=> Substituting "id" in file' \
 		'warning: [subst.mk:id] Ignoring nonexistent file "file".' \
 		'fail: [subst.mk:id] The filename pattern "file" has no effect.' \
 		'*** Error code 1' \
 		'' \
 		'Stop.' \
 		"$make: stopped in $PWD"
 	test_case_end
 fi
 if test_case_begin "executable bit is preserved"; then
 @@ -1075,62 +1079,62 @@ if test_case_begin "executable bit is pr
 	create_file_lines "testcase.mk" \
 		'SUBST_CLASSES+=	id' \
 		'SUBST_STAGE.id=	pre-configure' \
 		'SUBST_FILES.id=	cmd data' \
 		'SUBST_VARS.id=		VAR' \
 		'VAR=			replaced' \
 		'' \
 		'.include "prepare-subst.mk"' \
 		'.include "mk/subst.mk"'
 	create_file_lines "cmd" \
 		'@VAR@'
 	create_file_lines "data" \
 		'@VAR@'
-	chmod +x "$tmpdir/cmd"
+	chmod +x 'cmd'
-	run_bmake "testcase.mk" "pre-configure" 1> "$tmpdir/out" 2>&1 \
+	run_bmake "testcase.mk" "pre-configure" 1> "$tmpdir/output" 2>&1 \
 	&& exitcode=0 || exitcode=$?
-	assert_that "out" --file-is-lines \
+	assert_that "$tmpdir/output" --file-is-lines \
 		'=> Substituting "id" in cmd data'
 	assert_that "cmd" --file-is-lines "replaced"
 	assert_that "data" --file-is-lines "replaced"
-	[ -x "$tmpdir/cmd" ] \
+	[ -x 'cmd' ] \
-	|| assert_fail "cmd must still be executable"
+	|| assert_fail 'cmd must still be executable\n'
-	[ -x "$tmpdir/data" ] \
+	[ -x 'data' ] \
-	&& assert_fail "data must not be executable"
+	&& assert_fail 'data must not be executable\n'
 	test_case_end
 fi
 if test_case_begin "unreadable file"; then
 	create_file_lines "testcase.mk" \
 		'SUBST_CLASSES+=	id' \
 		'SUBST_STAGE.id=	pre-configure' \
 		'SUBST_FILES.id=	unreadable-file' \
 		'SUBST_SED.id=		-e s,before,after,' \
 		'' \
 		'.include "prepare-subst.mk"' \
 		'.include "mk/subst.mk"'
 	create_file_lines "unreadable-file" \
 		'before'
-	chmod 0000 "$tmpdir/unreadable-file"
+	chmod 0000 'unreadable-file'
-	run_bmake "testcase.mk" "pre-configure" 1> "$tmpdir/out" 2>&1 \
+	run_bmake "testcase.mk" "pre-configure" 1> "$tmpdir/output" 2>&1 \
 	&& exitcode=0 || exitcode=$?
-	assert_that "out" --file-is-lines \
+	assert_that "$tmpdir/output" --file-is-lines \
 		'=> Substituting "id" in unreadable-file' \
 		'sh: cannot open unreadable-file: permission denied' \
 		'sh: cannot open unreadable-file: permission denied' \
 		'*** Error code 1' \
 		'' \
 		'Stop.' \
 		"$make: stopped in $PWD"
 	test_case_end
 fi
 if test_case_begin "identity substitution implementation"; then
 @@ -1243,83 +1247,83 @@ if test_case_begin "identity substitutio
 	create_file_lines "testcase.mk" \
 		'SUBST_CLASSES+=	id' \
 		'SUBST_FILES.id=	file' \
 		'SUBST_SED.id=		-e s,before,before,' \
 		'SUBST_SED.id+=		-e "s,before,before,"' \
 		"SUBST_SED.id+=		-e 's,before,before,'" \
 		'SUBST_NOOP_OK.id=	no' \
 		'' \
 		'.include "prepare-subst.mk"' \
 		'.include "mk/subst.mk"'
 	create_file_lines "file" \
 		'before'
-	run_bmake "testcase.mk" "subst-id" 1> "$tmpdir/out" 2>&1 \
+	run_bmake "testcase.mk" "subst-id" 1> "$tmpdir/output" 2>&1 \
 	&& exitcode=0 || exitcode=$?
-	assert_that "out" --file-is-lines \
+	assert_that "$tmpdir/output" --file-is-lines \
 		'=> Substituting "id" in file'
 	test_case_end
 fi
 if test_case_begin "identity substitution, not found in file"; then
 	create_file_lines "testcase.mk" \
 		'SUBST_CLASSES+=	id' \
 		'SUBST_FILES.id=	file' \
 		'SUBST_SED.id=		s,before,before,' \
 		'SUBST_NOOP_OK.id=	no' \
 		'' \
 		'.include "prepare-subst.mk"' \
 		'.include "mk/subst.mk"'
 	create_file_lines "file" \
 		'other'
-	run_bmake "testcase.mk" "subst-id" 1> "$tmpdir/out" 2>&1 \
+	run_bmake "testcase.mk" "subst-id" 1> "$tmpdir/output" 2>&1 \
 	&& exitcode=0 || exitcode=$?
-	assert_that "out" --file-is-lines \
+	assert_that "$tmpdir/output" --file-is-lines \
 		'=> Substituting "id" in file' \
 		'warning: [subst.mk:id] Nothing changed in "file".' \
 		'fail: [subst.mk:id] The filename pattern "file" has no effect.' \
 		'*** Error code 1' \
 		'' \
 		'Stop.' \
 		"$make: stopped in $PWD"
 	test_case_end
 fi
 if test_case_begin "identity + effective substitution"; then
 	create_file_lines "testcase.mk" \
 		'SUBST_CLASSES+=	id' \
 		'SUBST_FILES.id=	file' \
 		'SUBST_SED.id=		-e s,no-op,no-op,g' \
 		'SUBST_SED.id+=		-e s,from,to,' \
 		'SUBST_NOOP_OK.id=	no' \
 		'' \
 		'.include "prepare-subst.mk"' \
 		'.include "mk/subst.mk"'
 	create_file_lines "file" \
 		'from'
-	run_bmake "testcase.mk" "subst-id" 1> "$tmpdir/out" 2>&1 \
+	run_bmake "testcase.mk" "subst-id" 1> "$tmpdir/output" 2>&1 \
 	&& exitcode=0 || exitcode=$?
-	assert_that "out" --file-is-lines \
+	assert_that "$tmpdir/output" --file-is-lines \
 		'=> Substituting "id" in file'
 	assert_that "file" --file-is-lines \
 		'to'
 	test_case_end
 fi
 if test_case_begin "identity + no-op substitution"; then
 	# If there were only an identity substitution, it wouldn't be an
 	# error.  But since there is a regular substitution as well,
 	# that substitution is an unexpected no-op and is therefore
 @@ -1327,30 +1331,30 @@ if test_case_begin "identity + no-op sub
 	create_file_lines "testcase.mk" \
 		'SUBST_CLASSES+=	id' \
 		'SUBST_FILES.id=	file' \
 		'SUBST_SED.id=		-e s,no-op,no-op,g' \
 		'SUBST_SED.id+=		-e s,from,to,' \
 		'SUBST_NOOP_OK.id=	no' \
 		'' \
 		'.include "prepare-subst.mk"' \
 		'.include "mk/subst.mk"'
 	create_file_lines "file" \
 		'other'
-	run_bmake "testcase.mk" "subst-id" 1> "$tmpdir/out" 2>&1 \
+	run_bmake "testcase.mk" "subst-id" 1> "$tmpdir/output" 2>&1 \
 	&& exitcode=0 || exitcode=$?
-	assert_that "out" --file-is-lines \
+	assert_that "$tmpdir/output" --file-is-lines \
 		'=> Substituting "id" in file' \
 		'warning: [subst.mk:id] Nothing changed in "file".' \
 		'fail: [subst.mk:id] The filename pattern "file" has no effect.' \
 		'*** Error code 1' \
 		'' \
 		'Stop.' \
 		"$make: stopped in $PWD"
 	assert_that "file" --file-is-lines \
 		'other'
 	test_case_end
 fi
 @@ -1362,90 +1366,90 @@ if test_case_begin "SUBST_FILTER_CMD + S
 	# redundant variable definitions, this case fails fast.
 	create_file_lines "testcase.mk" \
 		'SUBST_CLASSES+=	id' \
 		'SUBST_FILES.id=	file' \
 		'SUBST_FILTER_CMD.id=	tr -d "0-9"' \
 		'SUBST_SED.id=		-e s,x,x,' \
 		'SUBST_NOOP_OK.id=	no' \
 		'' \
 		'.include "prepare-subst.mk"' \
 		'.include "mk/subst.mk"'
 	create_file_lines "file" \
 		'letters 123 letters'
-	create_file_lines "main.mk" \
+	create_file_lines "$tmpdir/main.mk" \
 		"PKGSRCDIR=	$pkgsrcdir" \
 		".PATH:		$mocked_pkgsrcdir" \
 		".PATH:		$pkgsrcdir" \
 		".include \"testcase.mk\"" \
 		'' \
 		'all: subst-id' \
 		'	@printf '\''fail reason: %s\n'\'' ${PKG_FAIL_REASON} 1>&2'
-	"$make" -f "$tmpdir/main.mk" "all" 1> "$tmpdir/out" 2>&1 \
+	"$make" -f "$tmpdir/main.mk" "all" 1> "$tmpdir/output" 2>&1 \
 	&& exitcode=0 || exitcode=$?
-	assert_that "out" --file-is-lines \
+	assert_that "$tmpdir/output" --file-is-lines \
 		'=> Substituting "id" in file' \
 		'fail reason: [subst.mk:id] SUBST_FILTER_CMD and SUBST_SED/SUBST_VARS cannot be combined.'
 	assert_that "file" --file-is-lines \
 		'letters  letters'
 	test_case_end
 fi
 if test_case_begin "effective SUBST_FILTER_CMD in NOOP_OK=no mode"; then
 	create_file_lines "testcase.mk" \
 		'SUBST_CLASSES+=	id' \
 		'SUBST_FILES.id=	file' \
 		'SUBST_FILTER_CMD.id=	tr -d "0-9"' \
 		'SUBST_NOOP_OK.id=	no' \
 		'' \
 		'.include "prepare-subst.mk"' \
 		'.include "mk/subst.mk"'
 	create_file_lines "file" \
 		'letters 123 letters'
-	run_bmake "testcase.mk" "subst-id" 1> "$tmpdir/out" 2>&1 \
+	run_bmake "testcase.mk" "subst-id" 1> "$tmpdir/output" 2>&1 \
 	&& exitcode=0 || exitcode=$?
-	assert_that "out" --file-is-lines \
+	assert_that "$tmpdir/output" --file-is-lines \
 		'=> Substituting "id" in file'
 	assert_that "file" --file-is-lines \
 		'letters  letters'
 	test_case_end
 fi
 if test_case_begin "no-op SUBST_FILTER_CMD in NOOP_OK=no mode"; then
 	create_file_lines "testcase.mk" \
 		'SUBST_CLASSES+=	id' \
 		'SUBST_FILES.id=	file' \
 		'SUBST_FILTER_CMD.id=	tr -d "0-9"' \
 		'SUBST_NOOP_OK.id=	no' \
 		'' \
 		'.include "prepare-subst.mk"' \
 		'.include "mk/subst.mk"'
 	create_file_lines "file" \
 		'only letters'
-	run_bmake "testcase.mk" "subst-id" 1> "$tmpdir/out" 2>&1 \
+	run_bmake "testcase.mk" "subst-id" 1> "$tmpdir/output" 2>&1 \
 	&& exitcode=0 || exitcode=$?
-	assert_that "out" --file-is-lines \
+	assert_that "$tmpdir/output" --file-is-lines \
 		'=> Substituting "id" in file' \
 		'warning: [subst.mk:id] Nothing changed in "file".' \
 		'fail: [subst.mk:id] The filename pattern "file" has no effect.' \
 		'*** Error code 1' \
 		'' \
 		'Stop.' \
 		"$make: stopped in $PWD"
 	assert_that "file" --file-is-lines \
 		'only letters'
 	test_case_end
 fi
 @@ -1453,55 +1457,55 @@ fi
 if test_case_begin "backtick in SUBST_SED"; then
 	create_file_lines "testcase.mk" \
 		'SUBST_CLASSES+=	id' \
 		'SUBST_FILES.id=	file' \
 		"SUBST_SED.id=		-e 's,\"\\\\\`,\"\\\\\`,'" \
 		'' \
 		'.include "prepare-subst.mk"' \
 		'.include "mk/subst.mk"'
 	create_file_lines "file" \
 		'from`'
-	run_bmake "testcase.mk" "subst-id" 1> "$tmpdir/out" 2>&1 \
+	run_bmake "testcase.mk" "subst-id" 1> "$tmpdir/output" 2>&1 \
 	&& exitcode=0 || exitcode=$?
-	assert_that "out" --file-is-lines \
+	assert_that "$tmpdir/output" --file-is-lines \
 		'=> Substituting "id" in file' \
 		'info: [subst.mk:id] Nothing changed in "file".'
 	test_case_end
 fi
 if test_case_begin "multiple sed commands with semicolon"; then
 	# From PR pkg/55226:
 	#  ===> Configuring for perl-5.30.2
 	# sh: 1: Syntax error: Word "/d"p" unexpected (expecting ")")
 	create_file_lines "testcase.mk" \
 		'SUBST_CLASSES+=	id' \
 		'SUBST_FILES.id=	file' \
 		'SUBST_SED.id=		-e "s/755/755/g;/umask(/d"' \
 		'SUBST_NOOP_OK.id=	no' \
 		'' \
 		'.include "prepare-subst.mk"' \
 		'.include "mk/subst.mk"'
 	create_file_lines "file" \
 		'$mode = 755;'
-	run_bmake "testcase.mk" "subst-id" 1> "$tmpdir/out" 2>&1 \
+	run_bmake "testcase.mk" "subst-id" 1> "$tmpdir/output" 2>&1 \
 	&& exitcode=0 || exitcode=$?
-	assert_that "out" --file-is-lines \
+	assert_that "$tmpdir/output" --file-is-lines \
 		'=> Substituting "id" in file' \
 		'warning: [subst.mk:id] Nothing changed in "file".' \
 		'fail: [subst.mk:id] The filename pattern "file" has no effect.' \
 		'*** Error code 1' \
 		'' \
 		'Stop.' \
 		"$make: stopped in $PWD"
 	test_case_end
 fi

 @@ -1,109 +1,104 @@
 #! /bin/sh
-# $NetBSD: extract.sh,v 1.4 2020/04/26 12:46:33 rillig Exp $
+# $NetBSD: extract.sh,v 1.5 2020/05/11 19:13:10 rillig Exp $
+#
 # Test cases for mk/extract/extract.
+#
 set -eu
 . "./test.subr"
 test_case_set_up() {
 	# XXX: The mocked pkgsrc directory should be somewhere else.
 	rm -rf "$tmpdir/pkgsrc" "$tmpdir/expected"
 	cd "$tmpdir"
 	LC_ALL=C
 	export LC_ALL
+}
 if test_case_begin "exclude directory by basename"; then
 	# Demonstrates that excluding a directory name also excludes that
 	# directory further down in the hierarchy.
+	#
 	# For example, with BSD tar and GNU tar it is not possible to exclude
 	# only the top-level "contrib" directory but still extract other
 	# contrib directories.
+	#
 	# Experienced in lang/gcc*, which has contrib/ and java-lib/contrib/.
 	create_file_lines "contrib/file"	"content"
 	create_file_lines "other/file"		"content"
 	create_file_lines "other/contrib/file"	"content"
-	tar cf "archive.tar" "contrib" "other"
+	tar cf "$tmpdir/archive.tar" "contrib" "other"
 	rm -r "contrib" "other"
-	sh "$pkgsrcdir/mk/extract/extract" -x "archive.tar" "contrib"
+	sh "$pkgsrcdir/mk/extract/extract" -x "$tmpdir/archive.tar" "contrib"
-	find . -print | sort > "extracted"
+	find . -print | sort > "$tmpdir/extracted"
-	assert_that "extracted" --file-is-lines \
+	assert_that "$tmpdir/extracted" --file-is-lines \
 		"." \
 		"./archive.tar" \
 		"./extracted" \
 		"./other" \
 		"./other/file"
 	test_case_end
 fi
 if test_case_begin "try to exclude directory by pattern with slash"; then
 	# Having exclusion patterns with slash does not work at all for
 	# the default tar extractor. The patterns are matched against
 	# the basename of the file to be extracted, and that basename
 	# obviously cannot contain a slash.
 	create_file_lines "contrib/file"	"content"
 	create_file_lines "other/file"		"content"
 	create_file_lines "other/contrib/file"	"content"
-	tar cf "archive.tar" "contrib" "other"
+	tar cf "$tmpdir/archive.tar" "contrib" "other"
 	rm -r "contrib" "other"
-	sh "$pkgsrcdir/mk/extract/extract" -x "archive.tar" "contrib/*"
+	sh "$pkgsrcdir/mk/extract/extract" -x "$tmpdir/archive.tar" "contrib/*"
-	find . -print | sort > "extracted"
+	find . -print | sort > "$tmpdir/extracted"
-	assert_that "extracted" --file-is-lines \
+	assert_that "$tmpdir/extracted" --file-is-lines \
 		"." \
 		"./archive.tar" \
 		"./contrib" \
 		"./extracted" \
 		"./other" \
 		"./other/contrib" \
 		"./other/file"
 	test_case_end
 fi
 if test_case_begin "exclude asterisk"; then
 	# Ensure that the exclusion pattern "*" is not expanded by the
 	# shell but passed as-is to the extractor.
+	#
 	# If the pattern were expanded, it would expand to 'expanded'
 	# and would thus not exclude anything from the actual archive,
 	# which means that all files in the archive would be extracted.
 	create_file_lines "contrib/file"	"content"
 	create_file_lines "other/file"		"content"
 	create_file_lines "other/contrib/file"	"content"
-	tar cf "archive.tar" "contrib" "other"
+	tar cf "$tmpdir/archive.tar" "contrib" "other"
 	rm -r "contrib" "other"
-	sh "$pkgsrcdir/mk/extract/extract" -x "archive.tar" "*"
+	> 'expanded'
 	sh "$pkgsrcdir/mk/extract/extract" -x "$tmpdir/archive.tar" "*"
 	rm 'expanded'
-	find . -print | sort > "extracted"
+	find . -print | sort > "$tmpdir/extracted"
-	assert_that "extracted" --file-is-lines \
+	assert_that "$tmpdir/extracted" --file-is-lines \
-		"." \
+		"."
 		"./archive.tar" \
 		"./extracted"
 	test_case_end
 fi
 # TODO: test -x on an archiver that doesn't support it.
 # TODO: add test for extracting only a few files.

 @@ -1,15 +1,15 @@
 #! /bin/sh
-# $NetBSD: check-portability.sh,v 1.4 2020/05/05 06:11:29 rillig Exp $
+# $NetBSD: check-portability.sh,v 1.5 2020/05/11 19:13:10 rillig Exp $
+#
 # Test cases for mk/check/check-portability.*.
+#
 set -eu
 . "./test.subr"
 # Runs the shell program for the given file.
 check_portability_sh() {
 	env	PATCHDIR='patches' \
 		PREFIX='/nonexistent' \
 		"$@" \
 @@ -19,59 +19,48 @@ check_portability_sh() {
+}
 # Runs the AWK program in standalone mode for the given file.
 check_portability_awk() {
 	env	CK_FNAME="$1" \
 		CK_PROGNAME='check-portability.awk' \
 		awk	-f "$pkgsrcdir/mk/check/check-subr.awk" \
 			-f "$pkgsrcdir/mk/check/check-portability.awk" \
 			"$1" \
 >"$tmpdir/out" 2>&1 \
 	&& exitcode=0 || exitcode=$?
+}
 test_case_set_up() {
 	rm -rf "$tmpdir/work"
 	mkdir "$tmpdir/work"
 	cd "$tmpdir/work"
 # TODO: remove the "work/" from the tests.
 # The $tmpdir must be a bit structured:
 # $tmpdir/pkgsrc	these files override the actual pkgsrc files
 # $tmpdir/work		current working directory
 if test_case_begin "test ... = ..."; then
-	create_file_lines 'work/file' \
+	create_file_lines 'file' \
 		'if [ "$var" = value ]; then' \
 		'  ...' \
 		'elif test "$var" = value ]; then' \
 		'  ...' \
 		'fi'
 	check_portability_awk 'file'
-	assert_that 'out' --file-is-empty
+	assert_that "$tmpdir/out" --file-is-empty
 	assert_that $exitcode --equals 0
 	test_case_end
 fi
 if test_case_begin 'test ... == ...'; then
-	create_file_lines 'work/file' \
+	create_file_lines 'file' \
 		'if [ "$var" == value ]; then' \
 		'  ...' \
 		'elif test "$var" == value ]; then' \
 		'  ...' \
 		'fi'
 	check_portability_awk 'file'
 	create_file 'expected' <<'EOF'
 ERROR: [check-portability.awk] => Found test ... == ...:
 ERROR: [check-portability.awk] file:1: if [ "$var" == value ]; then
 ERROR: [check-portability.awk] file:3: elif test "$var" == value ]; then
 @@ -83,101 +72,101 @@ versions of ksh support it.
 When you run "test foo == foo" on a platform that does not support the
 "==" operator, the result will be "false" instead of "true". This can
 lead to unexpected behavior.
 There are two ways to fix this error message. If the file that contains
 the "test ==" is needed for building the package, you should create a
 patch for it, replacing the "==" operator with "=". If the file is not
 needed, add its name to the CHECK_PORTABILITY_SKIP variable in the
 package Makefile.
 ===========================================================================
 EOF
-	assert_that 'out' --file-equals 'expected'
+	assert_that "$tmpdir/out" --file-equals 'expected'
 	assert_that $exitcode --equals 1
 	test_case_end
 fi
 if test_case_begin 'configure patched, configure.in bad'; then
-	create_file_lines 'work/patches/patch-aa' \
+	create_file_lines 'patches/patch-aa' \
 		'+++ configure 2020-05-04'
-	create_file_lines 'work/configure' \
+	create_file_lines 'configure' \
 		'#! /bin/sh' \
 		'good'
-	create_file_lines 'work/configure.in' \
+	create_file_lines 'configure.in' \
 		'test a == b'
 	check_portability_sh \
 		'CHECK_PORTABILITY_EXPERIMENTAL=yes'
-	assert_that "out" --file-is-empty
+	assert_that "$tmpdir/out" --file-is-empty
 	assert_that $exitcode --equals 0
 	test_case_end
 fi
 if test_case_begin 'Makefile.in patched, Makefile.am bad'; then
 	# As of 2020-05-05, Makefile.am is not checked at all since only
 	# very few packages actually use that file during the build.
-	create_file_lines 'work/patches/patch-aa' \
+	create_file_lines 'patches/patch-aa' \
 		'+++ Makefile.in 2020-05-05'
-	create_file_lines 'work/Makefile.in' \
+	create_file_lines 'Makefile.in' \
 		'test a = b'
-	create_file_lines 'work/Makefile.am' \
+	create_file_lines 'Makefile.am' \
 		'test a == b'
 	check_portability_sh \
 		'CHECK_PORTABILITY_EXPERIMENTAL=yes'
-	assert_that "out" --file-is-empty
+	assert_that "$tmpdir/out" --file-is-empty
 	assert_that $exitcode --equals 0
 	test_case_end
 fi
 if test_case_begin 'files that are usually not used for building'; then
 	# The following files are mostly interesting to the upstream
 	# developers and are not used during the actual build, except
 	# if the package rebuilds everything using the GNU autotools.
-	create_file_lines 'work/configure.ac' \
+	create_file_lines 'configure.ac' \
 		'test a == b'
-	create_file_lines 'work/Makefile.am' \
+	create_file_lines 'Makefile.am' \
 		'test a == b'
 	check_portability_sh \
 		'CHECK_PORTABILITY_EXPERIMENTAL=yes'
-	assert_that "out" --file-is-empty
+	assert_that "$tmpdir/out" --file-is-empty
 	assert_that $exitcode --equals 0
 	test_case_end
 fi
 if test_case_begin 'configure patched and still bad'; then
-	create_file_lines 'work/patches/patch-aa' \
+	create_file_lines 'patches/patch-aa' \
 		'+++ configure 2020-05-04'
-	create_file_lines 'work/configure' \
+	create_file_lines 'configure' \
 		'#! /bin/sh' \
 		'test a == b'
 	check_portability_sh \
 		'CHECK_PORTABILITY_EXPERIMENTAL=yes'
 	create_file 'expected' <<'EOF'
 ERROR: [check-portability.awk] => Found test ... == ...:
 ERROR: [check-portability.awk] configure:2: test a == b
 Explanation:
 ===========================================================================
 The "test" command, as well as the "[" command, are not required to know
 @@ -186,72 +175,73 @@ versions of ksh support it.
 When you run "test foo == foo" on a platform that does not support the
 "==" operator, the result will be "false" instead of "true". This can
 lead to unexpected behavior.
 There are two ways to fix this error message. If the file that contains
 the "test ==" is needed for building the package, you should create a
 patch for it, replacing the "==" operator with "=". If the file is not
 needed, add its name to the CHECK_PORTABILITY_SKIP variable in the
 package Makefile.
 ===========================================================================
 EOF
-	assert_that 'out' --file-equals 'expected'
+	assert_that "$tmpdir/out" --file-equals 'expected'
 	assert_that $exitcode --equals 1
 	test_case_end
 fi
 if test_case_begin 'special characters in filenames'; then
 	# Ensure that the filename matching for patched files
 	# does not treat special characters as shell metacharacters.
-	create_file_lines 'work/patches/patch-aa' \
+	create_file_lines 'patches/patch-aa' \
 		'+++ [[[[(`" 2020-05-04'
-	create_file_lines 'work/+++ [[[[(`"' \
+	create_file_lines '+++ [[[[(`"' \
 		'#! /bin/sh' \
 		'test a = b'
 	check_portability_sh \
 		'CHECK_PORTABILITY_EXPERIMENTAL=yes'
-	assert_that 'out' --file-is-empty
+	assert_that "$tmpdir/out" --file-is-empty
 	assert_that $exitcode --equals 0
 	test_case_end
 fi
 if test_case_begin 'no patches'; then
 	# Ensure that no error message is printed when there are no
 	# patch files.
 	create_file_lines 'file' \
 		'#! /bin/sh' \
 		'test a = b'
-	check_portability_sh
+	check_portability_sh \
 		CHECK_PORTABILITY_EXPERIMENTAL=no
-	assert_that 'out' --file-is-empty
+	assert_that "$tmpdir/out" --file-is-empty
 	assert_that $exitcode --equals 0
 	test_case_end
 fi
 if test_case_begin 'no experimental by default'; then
 	create_file_lines 'configure.in' \
 		'test a == b'
 	check_portability_sh \
 		'CHECK_PORTABILITY_EXPERIMENTAL=no'
-	assert_that 'out' --file-is-empty
+	assert_that "$tmpdir/out" --file-is-empty
 	assert_that $exitcode --equals 0
 	test_case_end
 fi

 @@ -1,47 +1,50 @@
 #! /bin/sh
-# $NetBSD: test.subr,v 1.13 2020/05/09 17:41:08 rillig Exp $
+# $NetBSD: test.subr,v 1.14 2020/05/11 19:13:10 rillig Exp $
+#
 # This file defines utilities for testing Makefile fragments and shell
 # programs from the pkgsrc infrastructure. While testing one part of the
 # infrastructure, other parts can be mocked away.
+#
 # A test case is defined by the following functions:
+#
 #	test_case_begin
 #	test_case_set_up
 #	test_case_tear_down
 #	test_case_end
+#
 # These functions form the structure for a test. To define a test, use the
 # following pattern:
+#
 # 	if test_case_begin "description of the test"; then
 #		...
-#		test_end
+#		test_case_end
 #	fi
+#
 # The functions test_case_set_up and test_case_tear_down can be defined in the
 # test file to provide a test fixture that is common to all test cases. These
 # functions are called by test_case_begin and test_case_end, respectively.
+#
 # During a test case, the following variables are defined:
+#
-#	tmpdir		a directory for creating intermediate files
+# tmpdir
-#	pkgsrcdir	the real pkgsrc directory
+#	a directory for creating intermediate files
 #	mocked_pkgsrcdir
-#			the directory where the mock files are installed,
+# pkgsrcdir
-#			which override the Makefile fragments from the real
+#	the real pkgsrc directory
 #			pkgsrc infrastructure
 # mocked_pkgsrcdir
 #	the directory where the mock files are installed, which override
 #	the Makefile fragments from the real pkgsrc infrastructure
+#
+#
 # Setting up a test
+#
 # mock_cmd
 #	Returns the path to a newly created shell program whose behavior
 #	(output and exit status) is specified by pairs of
 #	--when-args/--then-output or --when-args/--then-exit.
+#
 #	Example:
+#
 #	hello=$(mock_cmd mock-hello \
 #		--when-args "" --then-output "Hello, world!" \
 @@ -150,26 +153,31 @@ verbose_printf() {
 test_case_name="unknown test"
 test_case_begun=0
 test_case_ended=0
 test_case_begin() {
 	test_case_name="$1"
 	[ "$(expr "$test_case_name" : "$test_case_filter")" -gt 0 ] \
 	|| return 1
 	test_case_begun="`expr "$test_case_begun" + 1`"
 	verbose_printf 'running test case "%s"\n' "$test_case_name"
 	cd "$tmpdir" || exit 1
 	rm -rf 'work'
 	mkdir 'work' || exit 1
 	cd 'work' || exit 1
 	test_case_set_up
+}
 # Can be redefined by actual tests.
 test_case_set_up() {
+	:
+}
 # Can be redefined by actual tests.
 test_case_tear_down() {
+	:
+}
 @@ -233,38 +241,38 @@ EOF
 	done
 	cat <<EOF
 printf 'error: %s: no mock behavior defined for arguments "%s"\n' "\$0" "\$*" 1>&2
 exit 1
 EOF
 	} > "$tmpdir/$cmdname"
 	chmod +x "$tmpdir/$cmdname"
 	printf '%s\n' "$tmpdir/$cmdname"
+}
 create_file() {
 	assert_that "$#" --equals 1
-	mkdir -p "$(dirname "$tmpdir/$1")"
+	mkdir -p "$(dirname -- "$1")"
-	cat > "$tmpdir/$1"
+	cat > "$1"
+}
 create_file_lines() {
 	mkdir -p "$(dirname "$tmpdir/$1")"
 	_cfl_filename="$1"; shift
-	printf '%s\n' "$@" > "$tmpdir/$_cfl_filename"
+	mkdir -p "$(dirname -- "$_cfl_filename")"
 	printf '%s\n' "$@" > "$_cfl_filename"
+}
 create_pkgsrc_file() {
-	mkdir -p "$(dirname "$mocked_pkgsrcdir/$1")"
+	mkdir -p "$(dirname -- "$mocked_pkgsrcdir/$1")"
 	cat > "$mocked_pkgsrcdir/$1"
+}
 run_bmake() {
 	cat <<EOF > "$tmpdir/test.subr.main.mk"
 PKGSRCDIR=	$pkgsrcdir
 .PATH:		$mocked_pkgsrcdir
 .PATH:		$pkgsrcdir
 .include "$1"
 EOF
 	shift
 	"$make" -f "$tmpdir/test.subr.main.mk" "$@"
 @@ -279,80 +287,78 @@ assert_succeed() {
+}
 assert_fail() {
 	printf '%s' "$assert_fail_sep" 1>&2
 	assert_fail_sep='
+'
 	printf 'assertion failed in "%s": ' "$test_case_name" 1>&2
 	printf "$@" 1>&2
 	assert_failed=`expr "$assert_failed" + 1`
+}
-tmpdir_equal() {
+files_equal() {
-	(cd "$tmpdir" && diff -u -- "$@" >/dev/null) || return 1
+	(diff -u -- "$@" >/dev/null) || return 1
+}
-tmpdir_diff() {
+diff_without_timestamps() {
-	# removes the timestamps from the diff files since these are not
+	(diff -u -- "$@" || true) \
 	# useful in tests.
 	(cd "$tmpdir" && diff -u -- "$@" || true) \
 	| awk '/^(---|[+][+][+]) / { print($1, $2); next } { print }' 1>&2
+}
 assert_that() {
 	case "$2" in
 	(--equals)
 		if [ "x$1" = "x$3" ]; then
 			assert_succeed
 			return 0
 		fi
 		assert_fail '\n  expected: <%s>\n  but was:  <%s>\n' "$3" "$1"
 		;;
 	(--file-contains-exactly)
 		printf '%s\n' "$3" > "$tmpdir/expected"
-		if tmpdir_equal "expected" "$1"; then
+		if files_equal "$tmpdir/expected" "$1"; then
 			assert_succeed
 			return 0
 		fi
 		assert_fail 'file "%s" has unexpected content:\n' "$1"
-		tmpdir_diff "expected" "$1"
+		diff_without_timestamps "$tmpdir/expected" "$1"
 		;;
 	(--file-equals)
-		if tmpdir_equal "$3" "$1"; then
+		if files_equal "$3" "$1"; then
 			assert_succeed
 			return 0
 		fi
 		assert_fail 'files "%s" and "%s" differ:\n' "$1" "$3"
-		tmpdir_diff "$3" "$1"
+		diff_without_timestamps "$3" "$1"
 		;;
 	(--file-is-empty)
-		if tmpdir_equal "/dev/null" "$1"; then
+		if files_equal "/dev/null" "$1"; then
 			assert_succeed
 			return 0
 		fi
 		assert_fail 'file "%s" is not empty:\n' "$1"
-		tmpdir_diff "/dev/null" "$1"
+		diff_without_timestamps "/dev/null" "$1"
 		;;
 	(--file-is-lines)
 		_assert_that_tmp_actual="$1"
 		_assert_that_filename="$1"; shift 2
 		printf '%s\n' "$@" > "$tmpdir/expected"
-		if tmpdir_equal "expected" "$_assert_that_tmp_actual"; then
+		if files_equal "$tmpdir/expected" "$_assert_that_tmp_actual"; then
 			assert_succeed
 			return 0
 		fi
 		assert_fail 'file "%s" has unexpected content:\n' "$_assert_that_filename"
-		tmpdir_diff "expected" "$_assert_that_tmp_actual"
+		diff_without_timestamps "$tmpdir/expected" "$_assert_that_tmp_actual"
 		;;
 	(*)
 		printf 'usage: assert_that <expr> --equals <expr>\n' 1>&2
 		exit 1
 	esac
+}