[SV #38051] Recover all MAKEFLAGS after makefile rebuild step is complete.

Patch suggested by Frank Heckenbach <f.heckenbach@fh-soft.de>.

diff --git a/ChangeLog b/ChangeLog
index 2429872..93d28fa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-01-13  Paul Smith  <psmith@gnu.org>
+
+       * main.c (main): Restore all make flags after re-exec is complete.
+       Fixes Savannah bug #38051.
+
 2013-01-12  Paul Smith  <psmith@gnu.org>
 
        Convert CVS archive to Git.

diff --git a/main.c b/main.c
index 7bcc07a..754bf2d 100644 (file)
--- a/main.c
+++ b/main.c
@@ -2150,7 +2150,7 @@ main (int argc, char **argv, char **envp)
 
           /* Reset makeflags in case they were changed.  */
           {
-            const char *pv = define_makeflags (1, 1);
+            const char *pv = define_makeflags (1, 0);
             char *p = alloca (CSTRLEN ("MAKEFLAGS=") + strlen (pv) + 1);
             sprintf (p, "MAKEFLAGS=%s", pv);
             putenv (allocated_variable_expand (p));

diff --git a/tests/ChangeLog b/tests/ChangeLog
index dfec44b..708f482 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,8 @@
+2013-01-13  Paul Smith  <psmith@gnu.org>
+
+       * scripts/options/dash-n: Verify -n is preserved after recursive /
+       re-exec.  See Savannah bug #38051.
+
 2013-01-12  Paul Smith  <psmith@gnu.org>
 
        * scripts/features/parallelism: Change rule so it doesn't depend

diff --git a/tests/scripts/options/dash-n b/tests/scripts/options/dash-n
index 1953909..b6d564d 100644 (file)
--- a/tests/scripts/options/dash-n
+++ b/tests/scripts/options/dash-n
@@ -3,37 +3,24 @@ $description = "Test the -n option.\n";
 
 $details = "Try various uses of -n and ensure they all give the correct results.\n";
 
-open(MAKEFILE, "> $makefile");
-
-# The Contents of the MAKEFILE ...
-
-print MAKEFILE <<'EOMAKE';
+touch('orig');
 
+run_make_test(q!
 final: intermediate ; echo >> $@
 intermediate: orig ; echo >> $@
-
-EOMAKE
-
-close(MAKEFILE);
-
-&touch('orig');
-
-# TEST 0
-
-&run_make_with_options($makefile, "", &get_logfile);
-$answer = "echo >> intermediate\necho >> final\n";
-&compare_output($answer, &get_logfile(1));
+!,
+              '', "echo >> intermediate\necho >> final\n");
 
 # TEST 1
 
-&run_make_with_options($makefile, "-Worig -n", &get_logfile);
-$answer = "echo >> intermediate\necho >> final\n";
-&compare_output($answer, &get_logfile(1));
+run_make_test(undef, '-Worig -n', "echo >> intermediate\necho >> final\n");
 
-unlink('orig', 'intermediate', 'final');
+rmfiles(qw(orig intermediate final));
 
 # We consider the actual updated timestamp of targets with all
-# recursive commands, even with -n.
+# recursive commands, even with -n.  Switching this to the new model
+# is non-trivial because we use a trick below to change the log content
+# before we compare it ...
 
 $makefile2 = &get_tmpfile;
 
@@ -82,4 +69,32 @@ close(DASH_N_LOG);
 
 unlink(qw(a b c));
 
+# Ensure -n continues to be included with recursive/re-execed make
+# See Savannah bug #38051
+
+$topmake = &get_tmpfile;
+$submake = &get_tmpfile;
+
+open(MAKEFILE, "> $topmake");
+print MAKEFILE <<"EOF";
+foo: ; \@\$(MAKE) -f "$submake" bar
+EOF
+close(MAKEFILE);
+
+
+# The bar target should print what would happen, but not actually run
+open(MAKEFILE, "> $submake");
+print MAKEFILE <<'EOF';
+inc: ; touch $@
+-include inc
+bar: ; @echo $(strip $(MAKEFLAGS))
+EOF
+close(MAKEFILE);
+
+&run_make_with_options($topmake, '-n --no-print-directory', &get_logfile);
+$answer = "$make_path -f \"$submake\" bar\ntouch inc\necho --no-print-directory -n\n";
+&compare_output($answer, &get_logfile(1));
+
+unlink('inc');
+
 1;