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

* tests/scripts/features/statipattrules: Remove unset variable refs.

diff --git a/tests/scripts/features/statipattrules b/tests/scripts/features/statipattrules
index 7a6a8bcb73789668a8ad166f028437251203921d..ceee0a99c4c59d0f46abd0a5c8a1ca3b670c6e4a 100644 (file)
--- 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 a00b9848f8b6200df99e7257e33e249cb8b28e5e..59925caf395641ad59bb7e28d9d3ee875f72a65b 100644 (file)
--- 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.