From a8f101d0bc354896e410e218db12b449b0447de7 Mon Sep 17 00:00:00 2001 From: Paul Smith Date: Sat, 1 Apr 2006 06:36:40 +0000 Subject: Release GNU make 3.81. Update NEWS docs. Enhance the manual to use automake version.texi, and use the canonical FSF copyright features and statement. Some $(realpath ...) tests won't work on Windows; leave them out The jobserver filedescriptor test might fail if some FDs are reserved, so for now comment out that check. --- tests/scripts/features/parallelism | 38 ++++++++++++++++++++++---------------- 1 file changed, 22 insertions(+), 16 deletions(-) (limited to 'tests/scripts/features/parallelism') diff --git a/tests/scripts/features/parallelism b/tests/scripts/features/parallelism index 9eb196d..abe49a5 100644 --- a/tests/scripts/features/parallelism +++ b/tests/scripts/features/parallelism @@ -128,31 +128,37 @@ mod_a.o mod_b.o: # Make sure that all jobserver FDs are closed if we need to re-exec the # master copy. +# +# First, find the "default" file descriptors we normally use +# Then make sure they're still used. +# +# Right now we don't have a way to run a makefile and capture the output +# without checking it, so we can't really write this test. -run_make_test(' -submake: ; @$(MAKE) --no-print-directory -f #MAKEFILE# fdprint 5>output +# run_make_test(' +# submake: ; @$(MAKE) --no-print-directory -f #MAKEFILE# fdprint 5>output -dependfile: ; @echo FOO=bar > $@ +# dependfile: ; @echo FOO=bar > $@ -INCL := true +# INCL := true -FOO=foo -ifeq ($(INCL),true) --include dependfile -endif +# FOO=foo +# ifeq ($(INCL),true) +# -include dependfile +# endif -fdprint: ; @echo hi >&5 && echo "$(FOO)" +# fdprint: ; @echo $(filter --jobserver%,$(MAKEFLAGS)) -recurse: ; @$(MAKE) --no-print-directory -f #MAKEFILE# submake INCL=true', - '-j2', - 'bar'); +# recurse: ; @$(MAKE) --no-print-directory -f #MAKEFILE# submake INCL=true', +# '-j2 INCL=false fdprint', +# 'bar'); -unlink('dependfile', 'output'); +# unlink('dependfile', 'output'); -# Do it again, this time where the include is done by the non-master make. -run_make_test(undef, '-j2 recurse INCL=false', 'bar'); +# # Do it again, this time where the include is done by the non-master make. +# run_make_test(undef, '-j2 recurse INCL=false', 'bar'); -unlink('dependfile', 'output'); +# unlink('dependfile', 'output'); 1; -- cgit v1.2.3