diff options
| author | Paul Smith <psmith@gnu.org> | 2013-09-30 10:56:20 -0400 |
|---|---|---|
| committer | Paul Smith <psmith@gnu.org> | 2013-09-30 10:56:20 -0400 |
| commit | b1c7f0df4eadf55721902b5cc4236a4aaae7ee6a (patch) | |
| tree | 6421e9f36eee4122078f5102251aaca80bfb57d1 /tests | |
| parent | 8e12202870d40488cc5899254e227d8038433839 (diff) | |
| download | gunmake-b1c7f0df4eadf55721902b5cc4236a4aaae7ee6a.tar.gz | |
Fix portability issues for Guile 1.8.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/scripts/variables/GNUMAKEFLAGS | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/scripts/variables/GNUMAKEFLAGS b/tests/scripts/variables/GNUMAKEFLAGS index bd6979c..e9c0d55 100644 --- a/tests/scripts/variables/GNUMAKEFLAGS +++ b/tests/scripts/variables/GNUMAKEFLAGS @@ -25,7 +25,9 @@ erR --trace --no-print-directory"); # Verify that re-exec / recursion doesn't duplicate flags from GNUMAKEFLAGS -$extraENV{GNUMAKEFLAGS} = '-I/tmp -Oline'; +unlink('x.mk'); + +$extraENV{GNUMAKEFLAGS} = '-Itst/bad -Oline'; run_make_test(q! recurse: ; @echo $@; echo MAKEFLAGS = $$MAKEFLAGS; echo GNUMAKEFLAGS = $$GNUMAKEFLAGS; #MAKEPATH# -f #MAKEFILE# all @@ -33,7 +35,7 @@ all: ; @echo $@; echo MAKEFLAGS = $$MAKEFLAGS; echo GNUMAKEFLAGS = $$GNUMAKEFLAG -include x.mk x.mk: ; @echo $@; echo MAKEFLAGS = $$MAKEFLAGS; echo GNUMAKEFLAGS = $$GNUMAKEFLAGS; echo > $@ !, - "", "x.mk\nMAKEFLAGS = -I/tmp -Oline\nGNUMAKEFLAGS =\nrecurse\nMAKEFLAGS = -I/tmp -Oline\nGNUMAKEFLAGS =\n#MAKE#[1]: Entering directory '#PWD#'\nall\nMAKEFLAGS = w -I/tmp -Oline\nGNUMAKEFLAGS =\n#MAKE#[1]: Leaving directory '#PWD#'\n"); + "", "x.mk\nMAKEFLAGS = -Itst/bad -Oline\nGNUMAKEFLAGS =\nrecurse\nMAKEFLAGS = -Itst/bad -Oline\nGNUMAKEFLAGS =\n#MAKE#[1]: Entering directory '#PWD#'\nall\nMAKEFLAGS = w -Itst/bad -Oline\nGNUMAKEFLAGS =\n#MAKE#[1]: Leaving directory '#PWD#'\n"); unlink('x.mk'); |