diff options
Diffstat (limited to 'tests/scripts/features/parallelism')
| -rw-r--r-- | tests/scripts/features/parallelism | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/tests/scripts/features/parallelism b/tests/scripts/features/parallelism index 084f2cc..1f56748 100644 --- a/tests/scripts/features/parallelism +++ b/tests/scripts/features/parallelism @@ -143,30 +143,6 @@ intermed: | phony ; touch $@ phony: ; : phony', '-rR -j', ': phony'); rmfiles('target'); -# TEST #10: Don't put --jobserver-fds into a re-exec'd MAKEFLAGS. -# We can't test this directly because there's no way a makefile can -# show the value of MAKEFLAGS we were re-exec'd with. We can intuit it -# by looking for "disabling jobserver mode" warnings; we should only -# get one from the original invocation and none from the re-exec. -# See Savannah bug #18124 - -run_make_test(q! --include inc.mk -recur: -# @echo 'MAKEFLAGS = $(MAKEFLAGS)' - @rm -f inc.mk - @$(MAKE) -j2 -f #MAKEFILE# all -all: -# @echo 'MAKEFLAGS = $(MAKEFLAGS)' - @echo $@ -inc.mk: -# @echo 'MAKEFLAGS = $(MAKEFLAGS)' - @echo 'FOO = bar' > $@ -!, - '--no-print-directory -j2', "#MAKE#[1]: warning: -jN forced in submake: disabling jobserver mode.\nall\n"); - -rmfiles('inc.mk'); - # TEST #11: Make sure -jN from MAKEFLAGS is processed even when we re-exec # See Savannah bug #33873 @@ -202,26 +178,6 @@ file2: file1 ; @touch $@ rmfiles('file1', 'file2', 'file3', 'file4'); -# Test recursion when make doesn't think it exists. -# See Savannah bug #39934 -# Or Red Hat bug https://bugzilla.redhat.com/show_bug.cgi?id=885474 - -open(MAKEFILE,"> Makefile2"); -print MAKEFILE <<EOF; -vpath %.c $ENV{HOME}/ -foo: -EOF -close(MAKEFILE); - -run_make_test(q! -default: ; @ #MAKEPATH# -f Makefile2 -!, - '-j2 --no-print-directory', -"#MAKE#[1]: warning: jobserver unavailable: using -j1. Add '+' to parent make rule. -#MAKE#[1]: Nothing to be done for 'foo'."); - -unlink('Makefile2'); - # Make sure that all jobserver FDs are closed if we need to re-exec the # master copy. # |