mirror of
https://git.savannah.gnu.org/git/make.git
synced 2024-12-28 15:57:48 +00:00
8e024a2532
Previously if --no-print-directory was seen anywhere even once (environment, command line, etc.) it would always take precedence over any --print-directory option. Change this so that the last seen option (which will be the command line, if present there) takes precedence. * NEWS: Mark this change in behavior. * src/makeint.h (print_directory): A new variable to control printing. * src/output.c (output_dump): Use the new variable. (output_start): Ditto. * src/main.c: Add a new variable print_directory. Use -1 for print_directory_flag so we know of the option was seen or not. Add a new default_print_directory_flag set to -1 to keep options from being added. (switches): Use flag_off for --no-print-directory, rather than a separate inhibit_print_directory_flag. (main): If print_directory_flag was set by the user, use that for print_directory. If not, compute the print_directory value based on -s, -C, and sub-makes as before. * tests/scripts/variables/GNUMAKEFLAGS: -w is not added automatically * tests/scripts/options/print-directory: Add tests for overriding print-directory options.
42 lines
1.3 KiB
Perl
42 lines
1.3 KiB
Perl
# -*-perl-*-
|
|
|
|
$description = "Test proper behavior of GNUMAKEFLAGS";
|
|
|
|
# Accept flags from GNUMAKEFLAGS as well as MAKEFLAGS
|
|
# Results always go in MAKEFLAGS
|
|
|
|
$extraENV{'GNUMAKEFLAGS'} = '-e -r -R';
|
|
|
|
run_make_test(q!
|
|
all: ; @echo $(MAKEFLAGS)
|
|
!,
|
|
'', 'erR');
|
|
|
|
# Long arguments mean everything is prefixed with "-"
|
|
|
|
$extraENV{'GNUMAKEFLAGS'} = '--no-print-directory -e -r -R --trace';
|
|
|
|
run_make_test(q!
|
|
all: ; @echo $(MAKEFLAGS)
|
|
!,
|
|
'', "#MAKEFILE#:2: target 'all' does not exist
|
|
echo erR --trace --no-print-directory
|
|
erR --trace --no-print-directory");
|
|
|
|
# Verify that re-exec / recursion doesn't duplicate flags from GNUMAKEFLAGS
|
|
|
|
unlink('x.mk');
|
|
|
|
$extraENV{GNUMAKEFLAGS} = '-Itst/bad';
|
|
|
|
run_make_test(q!
|
|
recurse: ; @echo $@; echo MAKEFLAGS = $$MAKEFLAGS; echo GNUMAKEFLAGS = $$GNUMAKEFLAGS; #MAKEPATH# -f #MAKEFILE# all
|
|
all: ; @echo $@; echo MAKEFLAGS = $$MAKEFLAGS; echo GNUMAKEFLAGS = $$GNUMAKEFLAGS
|
|
-include x.mk
|
|
x.mk: ; @echo $@; echo MAKEFLAGS = $$MAKEFLAGS; echo GNUMAKEFLAGS = $$GNUMAKEFLAGS; echo > $@
|
|
!,
|
|
"", "x.mk\nMAKEFLAGS = -Itst/bad\nGNUMAKEFLAGS =\nrecurse\nMAKEFLAGS = -Itst/bad\nGNUMAKEFLAGS =\n#MAKE#[1]: Entering directory '#PWD#'\nall\nMAKEFLAGS = -Itst/bad\nGNUMAKEFLAGS =\n#MAKE#[1]: Leaving directory '#PWD#'\n");
|
|
|
|
unlink('x.mk');
|
|
|
|
1;
|