diff options
| author | Paul Smith <psmith@gnu.org> | 2013-09-12 04:07:52 -0400 |
|---|---|---|
| committer | Paul Smith <psmith@gnu.org> | 2013-09-12 04:07:52 -0400 |
| commit | deff9dacc97cc20015d3018992f2c77cb7fab102 (patch) | |
| tree | 3da393310f9936a22aa211e6870a23e98b6fdebe /tests/scripts/variables | |
| parent | 40a49f244da5b417af8bede84ac221cee2318d88 (diff) | |
| download | gunmake-deff9dacc97cc20015d3018992f2c77cb7fab102.tar.gz | |
Enhance the output sync mode.
Create a new file, output.c, and collect functions that generate output there.
We introduce a new global context specifying where output should go (to stdout
or to a sync file), and the lowest level output generator chooses where to
write output based on that context.
This allows us to set the context globally, and all operations that write
output (including functions like $(info ...) etc.) will use it.
Removed the "--trace=dir" capability. It was too confusing. If you have
directory tracking enabled then output sync will print the enter/leave message
for each synchronized block. If you don't want that, disable directory
tracking.
Diffstat (limited to 'tests/scripts/variables')
| -rw-r--r-- | tests/scripts/variables/GNUMAKEFLAGS | 6 | ||||
| -rw-r--r-- | tests/scripts/variables/MAKEFLAGS | 4 | ||||
| -rw-r--r-- | tests/scripts/variables/MAKE_RESTARTS | 2 |
3 files changed, 8 insertions, 4 deletions
diff --git a/tests/scripts/variables/GNUMAKEFLAGS b/tests/scripts/variables/GNUMAKEFLAGS index c4df1c1..edef66e 100644 --- a/tests/scripts/variables/GNUMAKEFLAGS +++ b/tests/scripts/variables/GNUMAKEFLAGS @@ -14,11 +14,13 @@ all: ; @echo $(MAKEFLAGS) # Long arguments mean everything is prefixed with "-" -$extraENV{'GNUMAKEFLAGS'} = '--no-print-directory -e -r -R --trace=none --trace=dir'; +$extraENV{'GNUMAKEFLAGS'} = '--no-print-directory -e -r -R --trace'; run_make_test(q! all: ; @echo $(MAKEFLAGS) !, - '', 'erR --trace=none --trace=dir --trace=none --trace=dir --no-print-directory'); + '', "#MAKEFILE#:2: target 'all' does not exist +echo erR --trace --no-print-directory +erR --trace --no-print-directory"); 1; diff --git a/tests/scripts/variables/MAKEFLAGS b/tests/scripts/variables/MAKEFLAGS index b41d37c..8a5d0f6 100644 --- a/tests/scripts/variables/MAKEFLAGS +++ b/tests/scripts/variables/MAKEFLAGS @@ -14,7 +14,9 @@ all: ; @echo $(MAKEFLAGS) run_make_test(q! all: ; @echo $(MAKEFLAGS) !, - '--no-print-directory -e -r -R --trace=none --trace=dir', 'erR --trace=none --trace=dir --no-print-directory'); + '--no-print-directory -e -r -R --trace', "#MAKEFILE#:2: target 'all' does not exist +echo erR --trace --no-print-directory +erR --trace --no-print-directory"); # Recursive invocations of make should accumulate MAKEFLAGS values. diff --git a/tests/scripts/variables/MAKE_RESTARTS b/tests/scripts/variables/MAKE_RESTARTS index 711c627..ef8e368 100644 --- a/tests/scripts/variables/MAKE_RESTARTS +++ b/tests/scripts/variables/MAKE_RESTARTS @@ -52,8 +52,8 @@ MAKE_RESTARTS=1 foo.x:1: bar.x: No such file or directory MAKE_RESTARTS=2 recurse MAKE_RESTARTS= -MAKE_RESTARTS= #MAKE#[1]: Entering directory '#PWD#' +MAKE_RESTARTS= all MAKE_RESTARTS= #MAKE#[1]: Leaving directory '#PWD#'"); |