* tests/scripts/features/temp_stdin: Remove nested "my"

* tests/scripts/features/statipattrules: Remove unset variable refs.
This commit is contained in:
Paul Smith 2022-06-04 18:54:22 -04:00
parent 6d6f12b0c3
commit 59abb46bc9
2 changed files with 2 additions and 3 deletions

View file

@ -291,10 +291,9 @@ ${d}bye.x: $r%.x: $dollar\$(%); \$(info \$@ from \$^)
for my $d (@dir) {
my $prereqs = "${d}the%weird\\\\_hello_pattern%\\\\.1 ${d}the%weird\\\\_hello_pattern%\\\\.2";
run_make_test("
$se
.PHONY: $prereqs
all: ${d}the%weird\\\\_hello_pattern\\\\.x
${d}the\\%weird\\\\_hello_pattern\\\\.x: ${d}the\\%weird\\\\_%_pattern\\\\.x: $dollar\$(wordlist 1, 99, ${d}the\\%weird\\\\_%_pattern%\\\\.1 ${d}the\\%weird\\\\_%_pattern%\\\\.2); \$(info \$@ from \$^)
${d}the\\%weird\\\\_hello_pattern\\\\.x: ${d}the\\%weird\\\\_%_pattern\\\\.x: \$(wordlist 1, 99, ${d}the\\%weird\\\\_%_pattern%\\\\.1 ${d}the\\%weird\\\\_%_pattern%\\\\.2); \$(info \$@ from \$^)
", '', "${d}the%weird\\\\_hello_pattern\\\\.x from $prereqs\n#MAKE#: Nothing to be done for 'all'.\n");
}

View file

@ -50,7 +50,7 @@ check_tempfile($tdir);
# sv 62118,62145.
# Test that a stdin temp file is removed, even when make re-execs.
# Also test that make nohors TMPDIR to create the temp file.
my $tdir = tempdir(CLEANUP => 1);
$tdir = tempdir(CLEANUP => 1);
$ENV{'TMPDIR'} = $tdir;
$ENV{'TMP'} = $tdir;
# Ensure touching bye.mk causes re-exec.