mirrors/make
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/make.git synced 2025-02-05 06:04:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix regression tests after MAKEFLAGS enhancements.

Browse source
This commit is contained in:
Paul Smith 2013-05-22 07:51:46 -04:00
parent ecf307bb0b
commit 8ab3564a71
4 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tests/ChangeLog
View file

@ -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.

2
tests/scripts/options/dash-n
View 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 --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');

4
tests/scripts/variables/GNUMAKEFLAGS
View file

@ -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;

10
tests/scripts/variables/MAKEFLAGS
View file

@ -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;