]> git.ipfire.org Git - thirdparty/make.git/commitdiff
* tests/run_make_tests.pl: Preserve $make_command
authorPaul Smith <psmith@gnu.org>
Wed, 23 Mar 2016 05:26:55 +0000 (01:26 -0400)
committerPaul Smith <psmith@gnu.org>
Wed, 23 Mar 2016 05:26:55 +0000 (01:26 -0400)
* tests/scripts/options/dash-n: Use $make_command.  This fixes
a spurious failure when running tests with valgrind enabled.

tests/run_make_tests.pl
tests/scripts/options/dash-n

index ff10c21238f43b36120d4b2f1a3bc6557d560ecb..7005f10b19cffc60ce3039213f7132f34c6c03b7 100644 (file)
@@ -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")
index dfed419da6fb4edd8f80e8dc3220fe11216af942..02ae4a9956c550637df74ed631b04e8747b7d878 100644 (file)
@@ -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');