From 0a81d50d66565fd3e930fadaadc4a5cb9381d840 Mon Sep 17 00:00:00 2001
From: Paul Smith <psmith@gnu.org>
Date: Sun, 15 Sep 2013 13:30:21 -0400
Subject: [SV 39203] Don't set MAKEFLAGS when restarting.

We are restarting with the original command line flags, so if we set
MAKEFLAGS as well that will cause double flags.
---
 tests/ChangeLog            |  5 +++++
 tests/scripts/options/eval | 10 ++++++++++
 2 files changed, 15 insertions(+)

(limited to 'tests')

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 5eff7ec..c629a0e 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,8 @@
+2013-09-15  Paul Smith  <psmith@gnu.org>
+
+	* scripts/options/eval: Verify --eval during restart.
+	Test for Savannah bug #39203.
+
 2013-09-14  Paul Smith  <psmith@gnu.org>
 
 	* scripts/features/output-sync: Verify -Orecurse properly.
diff --git a/tests/scripts/options/eval b/tests/scripts/options/eval
index 06a035c..0f82409 100644
--- a/tests/scripts/options/eval
+++ b/tests/scripts/options/eval
@@ -16,4 +16,14 @@ recurse: ; @$(MAKE) -f #MAKEFILE# && echo recurse!,
 run_make_test(undef, '--no-print-directory --eval=\$\(info\ eval\) recurse',
               "eval\neval\nall\nrecurse");
 
+# Make sure that --eval is handled correctly during restarting
+run_make_test(q!
+all: ; @echo $@
+-include gen.mk
+gen.mk: ; @echo > $@
+!,
+              '--eval=\$\(info\ eval\)', "eval\neval\nall");
+
+unlink('gen.mk');
+
 1;
-- 
cgit v1.2.3