mirrors/make
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/make.git synced 2025-01-30 02:40:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Ensure that -n takes precedence over -t.

Browse source 
Patch from Michael Witten <mfwitten@gmail.com>
This commit is contained in:
Paul Smith 2011-09-02 05:37:54 +00:00
parent e4d5d43424
commit 9a9f83e8b5
4 changed files with 30 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2011-09-02 Paul Smith <psmith@gnu.org>
* remake.c (touch_file): If we have both -n and -t, -n takes
precedence. Patch from Michael Witten <mfwitten@gmail.com>
2011-08-29 Paul Smith <psmith@gnu.org> 2011-08-29 Paul Smith <psmith@gnu.org>
* expand.c (variable_expand_string): Always allocate a new buffer * expand.c (variable_expand_string): Always allocate a new buffer

4
remake.c
View file

@ -1113,6 +1113,10 @@ touch_file (struct file *file)
if (!silent_flag) if (!silent_flag)
message (0, "touch %s", file->name); message (0, "touch %s", file->name);
/* Print-only (-n) takes precedence over touch (-t). */
if (just_print_flag)
return 0;
#ifndef NO_ARCHIVES #ifndef NO_ARCHIVES
if (ar_name (file->name)) if (ar_name (file->name))
return ar_touch (file->name); return ar_touch (file->name);

5
tests/ChangeLog
View file

@ -1,3 +1,8 @@
2011-09-02 Paul Smith <psmith@gnu.org>
* scripts/options/dash-n: Verify that in "-n -t", the -n takes
priority. Patch from Michael Witten <mfwitten@gmail.com>.
2011-08-29 Paul Smith <psmith@gnu.org> 2011-08-29 Paul Smith <psmith@gnu.org>
* scripts/features/varnesting: Test resetting of variables while * scripts/features/varnesting: Test resetting of variables while

17
tests/scripts/options/dash-n
View file

@ -65,6 +65,21 @@ $answer = "$make_name: `a' is up to date.\n";
$answer = "$make_name: `a' is up to date.\n"; $answer = "$make_name: `a' is up to date.\n";
&compare_output($answer, &get_logfile(1)); &compare_output($answer, &get_logfile(1));
unlink('a', 'b', 'c'); # TEST 4
unlink(qw(a b));
&run_make_with_options($makefile2, "-t -n", &get_logfile);
open(DASH_N_LOG, ">>" . &get_logfile(1));
print DASH_N_LOG "a exists but should not!\n" if -e 'a';
print DASH_N_LOG "b exists but should not!\n" if -e 'b';
close(DASH_N_LOG);
&compare_output("touch b\ntouch a\n", &get_logfile(1));
# CLEANUP
unlink(qw(a b c));
1; 1;