| b.liu | e958203 | 2025-04-17 19:18:16 +0800 | [diff] [blame] | 1 | From: Bogdan Drozdowski <bogdandr AT op.pl> |
| 2 | Date: Sat, 31 Dec 2022 20:17:35 +0100 |
| 3 | Subject: [PATCH] Allow other V values for verbosity |
| 4 | |
| 5 | --- |
| 6 | m4/silent.m4 | 2 +- |
| 7 | t/silent-gen.sh | 24 ++++++++++++++++++++++++ |
| 8 | 2 files changed, 25 insertions(+), 1 deletion(-) |
| 9 | |
| 10 | --- a/m4/silent.m4 |
| 11 | +++ b/m4/silent.m4 |
| 12 | @@ -43,7 +43,7 @@ else |
| 13 | fi]) |
| 14 | if test $am_cv_make_support_nested_variables = yes; then |
| 15 | dnl Using '$V' instead of '$(V)' breaks IRIX make. |
| 16 | - AM_V='$(V)' |
| 17 | + AM_V='$(shell if ( test "x$(V)" = "x0" ); then echo 0; elif ( test "x$(V)" = "x" ); then echo $(AM_DEFAULT_VERBOSITY); else echo 1; fi)' |
| 18 | AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' |
| 19 | else |
| 20 | AM_V=$AM_DEFAULT_VERBOSITY |
| 21 | --- a/t/silent-gen.sh |
| 22 | +++ b/t/silent-gen.sh |
| 23 | @@ -54,6 +54,18 @@ grep 'cp ' stdout |
| 24 | grep 'echo ' stdout |
| 25 | |
| 26 | $MAKE clean |
| 27 | +run_make -O V=99 |
| 28 | +grep 'GEN ' stdout && exit 1 |
| 29 | +grep 'cp ' stdout |
| 30 | +grep 'echo ' stdout |
| 31 | + |
| 32 | +$MAKE clean |
| 33 | +run_make -O V=vvv |
| 34 | +grep 'GEN ' stdout && exit 1 |
| 35 | +grep 'cp ' stdout |
| 36 | +grep 'echo ' stdout |
| 37 | + |
| 38 | +$MAKE clean |
| 39 | run_make -O V=0 |
| 40 | grep 'GEN .*foo' stdout |
| 41 | grep 'cp ' stdout && exit 1 |
| 42 | @@ -78,5 +90,17 @@ run_make -O V=1 |
| 43 | grep 'GEN ' stdout && exit 1 |
| 44 | grep 'cp ' stdout |
| 45 | grep 'echo ' stdout |
| 46 | + |
| 47 | +$MAKE clean |
| 48 | +run_make -O V=99 |
| 49 | +grep 'GEN ' stdout && exit 1 |
| 50 | +grep 'cp ' stdout |
| 51 | +grep 'echo ' stdout |
| 52 | + |
| 53 | +$MAKE clean |
| 54 | +run_make -O V=v |
| 55 | +grep 'GEN ' stdout && exit 1 |
| 56 | +grep 'cp ' stdout |
| 57 | +grep 'echo ' stdout |
| 58 | |
| 59 | : |