From 59abb46bc9a4e4845c2797e17b5986eb2d528649 Mon Sep 17 00:00:00 2001 From: Paul Smith Date: Sat, 4 Jun 2022 18:54:22 -0400 Subject: [PATCH] * tests/scripts/features/temp_stdin: Remove nested "my" * tests/scripts/features/statipattrules: Remove unset variable refs. --- tests/scripts/features/statipattrules | 3 +-- tests/scripts/features/temp_stdin | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/tests/scripts/features/statipattrules b/tests/scripts/features/statipattrules index 7a6a8bcb..ceee0a99 100644 --- a/tests/scripts/features/statipattrules +++ b/tests/scripts/features/statipattrules @@ -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"); } diff --git a/tests/scripts/features/temp_stdin b/tests/scripts/features/temp_stdin index a00b9848..59925caf 100644 --- a/tests/scripts/features/temp_stdin +++ b/tests/scripts/features/temp_stdin @@ -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. -- 2.47.3