From: Paul Smith <psmith@gnu.org>
Date: Wed, 23 Mar 2016 05:26:55 +0000 (-0400)
Subject: * tests/run_make_tests.pl: Preserve $make_command
X-Git-Tag: 4.1.90~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=40277b885082bd62e1e312bc1226a383df899802;p=thirdparty%2Fmake.git

* tests/run_make_tests.pl: Preserve $make_command

* tests/scripts/options/dash-n: Use $make_command.  This fixes
a spurious failure when running tests with valgrind enabled.
---

diff --git a/tests/run_make_tests.pl b/tests/run_make_tests.pl
index ff10c212..7005f10b 100644
--- a/tests/run_make_tests.pl
+++ b/tests/run_make_tests.pl
@@ -465,6 +465,8 @@ sub set_more_defaults
 
    # Set up for valgrind, if requested.
 
+   $make_command = $make_path;
+
    if ($valgrind) {
      my $args = $valgrind_args;
      open(VALGRIND, "> valgrind.out")
diff --git a/tests/scripts/options/dash-n b/tests/scripts/options/dash-n
index dfed419d..02ae4a99 100644
--- a/tests/scripts/options/dash-n
+++ b/tests/scripts/options/dash-n
@@ -92,7 +92,7 @@ EOF
 close(MAKEFILE);
 
 &run_make_with_options($topmake, '-n --no-print-directory', &get_logfile);
-$answer = "$make_path -f \"$submake\" bar\ntouch inc\necho n --no-print-directory\n";
+$answer = "$make_command -f \"$submake\" bar\ntouch inc\necho n --no-print-directory\n";
 &compare_output($answer, &get_logfile(1));
 
 unlink('inc');