diff options
Diffstat (limited to 'tests/scripts/features/jobserver')
| -rw-r--r-- | tests/scripts/features/jobserver | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/tests/scripts/features/jobserver b/tests/scripts/features/jobserver index f8cae542..50d51f80 100644 --- a/tests/scripts/features/jobserver +++ b/tests/scripts/features/jobserver @@ -110,7 +110,7 @@ default: ; @ #MAKEPATH# -f Makefile2 rmfiles('Makefile2'); } -# Ensure enter/leave directory messages appear before jobserver warnings +# SV 63981: Don't generat warnings if the user specifically disabled -j run_make_test(q! all: ; @$(MAKE) -C . -f #MAKEFILE# recurse -j1 @@ -118,7 +118,19 @@ recurse: ; @echo hi !, '-w -j2', "#MAKE#: Entering directory '#PWD#' #MAKE#[1]: Entering directory '#PWD#' -#MAKE#[1]: warning: -j1 forced in submake: resetting jobserver mode +hi +#MAKE#[1]: Leaving directory '#PWD#' +#MAKE#: Leaving directory '#PWD#'"); + +# Ensure enter/leave directory messages appear before jobserver warnings + +run_make_test(q! +all: ; @$(MAKE) -C . -f #MAKEFILE# recurse -j10 +recurse: ; @echo hi +!, + '-w -j2', "#MAKE#: Entering directory '#PWD#' +#MAKE#[1]: Entering directory '#PWD#' +#MAKE#[1]: warning: -j10 forced in submake: resetting jobserver mode hi #MAKE#[1]: Leaving directory '#PWD#' #MAKE#: Leaving directory '#PWD#'\n"); |