@matheusbsbs / matheus-bagliano / commits / 477dcaddb6
Fork 0

tests: do not let lazy prereqs inside `test_expect_*` turn off tracing

The `test_expect_*` functions use `test_eval_` and so does `test_run_lazy_prereq_`. If tracing is enabled via the `-x` option, `test_eval_` turns on tracing while evaluating the code block, and turns it off directly after it. This is unwanted for nested invocations. One somewhat surprising example of this is when running a test that calls `test_i18ngrep`: that function requires the `C_LOCALE_OUTPUT` prereq, and that prereq is a lazy one, so it is evaluated via `test_eval_`, the command tracing is turned off, and the test case continues to run _without tracing the commands_. Another somewhat surprising example is when one lazy prereq depends on another lazy prereq: the former will call `test_have_prereq` with the latter one, which in turn calls `test_eval_` and -- you guessed it -- tracing (if enabled) will be turned off _before_ returning to evaluating the other lazy prereq. As we will introduce just such a scenario with the GPG, GPGSM and RFC1991 prereqs, let's fix that by introducing a variable that keeps track of the current trace level: nested `test_eval_` calls will increment and then decrement the level, and only when it reaches 0, the tracing will _actually_ be turned off. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Johannes Schindelin committed Mar 26, 2020 at 15:35 UTC 477dcaddb6dceb0fc5b5064edef460d9d226386e
2 files changed +17 -2
t/t0000-basic.sh
+13
@@ -833,6 +833,19 @@ then
833 exit 1
834 fi
835
836 +test_expect_success 'lazy prereqs do not turn off tracing' "
837 + run_sub_test_lib_test lazy-prereq-and-tracing \
838 + 'lazy prereqs and -x' -v -x <<-\\EOF &&
839 + test_lazy_prereq LAZY true
840 +
841 + test_expect_success lazy 'test_have_prereq LAZY && echo trace'
842 +
843 + test_done
844 + EOF
845 +
846 + grep 'echo trace' lazy-prereq-and-tracing/err
847 +"
848 +
849 test_expect_success 'tests clean up even on failures' "
850 run_sub_test_lib_test_err \
851 failing-cleanup 'Failing tests with cleanup commands' <<-\\EOF &&
t/test-lib.sh
+4 -2
@@ -882,6 +882,7 @@ maybe_setup_valgrind () {
882 fi
883 }
884
885 +trace_level_=0
886 want_trace () {
887 test "$trace" = t && {
888 test "$verbose" = t || test "$verbose_log" = t
@@ -895,7 +896,7 @@ want_trace () {
896 test_eval_inner_ () {
897 # Do not add anything extra (including LF) after '$*'
898 eval "
898 - want_trace && set -x
899 + want_trace && trace_level_=$(($trace_level_+1)) && set -x
900 $*"
901 }
902
@@ -926,7 +927,8 @@ test_eval_ () {
927 test_eval_ret_=$?
928 if want_trace
929 then
929 - set +x
930 + test 1 = $trace_level_ && set +x
931 + trace_level_=$(($trace_level_-1))
932 fi
933 } 2>/dev/null 4>&2
934