From 8ab3564a711dd3753fb6ad35f16717b01ce830b7 Mon Sep 17 00:00:00 2001
From: Paul Smith <psmith@gnu.org>
Date: Wed, 22 May 2013 07:51:46 -0400
Subject: [PATCH] Fix regression tests after MAKEFLAGS enhancements.
---
tests/ChangeLog | 6 ++++++
tests/scripts/options/dash-n | 2 +-
tests/scripts/variables/GNUMAKEFLAGS | 4 ++--
tests/scripts/variables/MAKEFLAGS | 10 +++++-----
4 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/tests/ChangeLog b/tests/ChangeLog
index d659d7ad..20c770e2 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,9 @@
+2013-05-22 Paul Smith <psmith@gnu.org>
+
+ * scripts/options/dash-n: Fix results after MAKEFLAGS fixes.
+ * scripts/variables/MAKEFLAGS: Ditto.
+ * scripts/variables/GNUMAKEFLAGS: Ditto.
+
2013-05-14 Paul Smith <psmith@gnu.org>
* scripts/features/loadapi: Add plugin_is_GPL_compatible symbol.
diff --git a/tests/scripts/options/dash-n b/tests/scripts/options/dash-n
index b6d564d8..dfed419d 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 --no-print-directory -n\n";
+$answer = "$make_path -f \"$submake\" bar\ntouch inc\necho n --no-print-directory\n";
&compare_output($answer, &get_logfile(1));
unlink('inc');
diff --git a/tests/scripts/variables/GNUMAKEFLAGS b/tests/scripts/variables/GNUMAKEFLAGS
index 7bfd8227..c4df1c1a 100644
--- a/tests/scripts/variables/GNUMAKEFLAGS
+++ b/tests/scripts/variables/GNUMAKEFLAGS
@@ -10,7 +10,7 @@ $extraENV{'GNUMAKEFLAGS'} = '-e -r -R';
run_make_test(q!
all: ; @echo $(MAKEFLAGS)
!,
- '', 'Rre');
+ '', 'erR');
# Long arguments mean everything is prefixed with "-"
@@ -19,6 +19,6 @@ $extraENV{'GNUMAKEFLAGS'} = '--no-print-directory -e -r -R --trace=none --trace=
run_make_test(q!
all: ; @echo $(MAKEFLAGS)
!,
- '', '--no-print-directory --trace=none --trace=dir --trace=none --trace=dir -Rre');
+ '', 'erR --trace=none --trace=dir --trace=none --trace=dir --no-print-directory');
1;
diff --git a/tests/scripts/variables/MAKEFLAGS b/tests/scripts/variables/MAKEFLAGS
index a4173883..b41d37cd 100644
--- a/tests/scripts/variables/MAKEFLAGS
+++ b/tests/scripts/variables/MAKEFLAGS
@@ -8,13 +8,13 @@ $details = "DETAILS";
run_make_test(q!
all: ; @echo $(MAKEFLAGS)
!,
- '-e -r -R', 'Rre');
+ '-e -r -R', 'erR');
# Long arguments mean everything is prefixed with "-"
run_make_test(q!
all: ; @echo $(MAKEFLAGS)
!,
- '--no-print-directory -e -r -R --trace=none --trace=dir', '--no-print-directory --trace=none --trace=dir -Rre');
+ '--no-print-directory -e -r -R --trace=none --trace=dir', 'erR --trace=none --trace=dir --no-print-directory');
# Recursive invocations of make should accumulate MAKEFLAGS values.
@@ -32,8 +32,8 @@ print:
.PHONY: all jump print
!,
'--no-print-directory',
- 'all: MAKEFLAGS=--no-print-directory
-jump Works: MAKEFLAGS=--no-print-directory -e
-print Works: MAKEFLAGS=--no-print-directory -e');
+ 'all: MAKEFLAGS= --no-print-directory
+jump Works: MAKEFLAGS=e --no-print-directory
+print Works: MAKEFLAGS=e --no-print-directory');
1;