Re: [PATCH] t/lib-httpd: pass GIT_TEST_SIDEBAND_ALL through Apache

From: Jeff King <peff@peff.net>
Date: Feb 14, 2019, 06:52 UTC
Message-ID: <20190214065226.GA22932@sigill.intra.peff.net>
In-Reply-To: <20190214063513.32041-1-tmz@pobox.com>

On Thu, Feb 14, 2019 at 01:35:13AM -0500, Todd Zullinger wrote:

Show 16 quoted lines

> 07c3c2aa16 ("tests: define GIT_TEST_SIDEBAND_ALL", 2019-01-16) added
> GIT_TEST_SIDEBAND_ALL to the apache.conf PassEnv list.  Avoid warnings
> from Apache when the variable is unset, as we do for GIT_VALGRIND* and
> GIT_TRACE, from f628825481 ("t/lib-httpd: handle running under
> --valgrind", 2012-07-24) and 89c57ab3f0 ("t: pass GIT_TRACE through
> Apache", 2015-03-13), respectively.
> 
> Signed-off-by: Todd Zullinger <tmz@pobox.com>
> ---
> I missed this with rc0, but poking through build logs I noticed a number
> of 'AH01506: PassEnv variable GIT_TEST_SIDEBAND_ALL was undefined'
> warnings.
> 
> I think exporting this in lib-httpd.sh like we do for GIT_VALGRIND* and
> GIT_TRACE is the way to go, as opposed to in test-lib.sh, as we do for
> things like GNUPGHOME.  But I could easily be wrong about that.

Yeah, I think this is the right place to put it (and this approach is the right thing to do).

Show 10 quoted lines

> diff --git a/t/lib-httpd.sh b/t/lib-httpd.sh
> index 216281eabc..0dfb48c2f6 100644
> --- a/t/lib-httpd.sh
> +++ b/t/lib-httpd.sh
> @@ -91,6 +91,7 @@ HTTPD_DOCUMENT_ROOT_PATH=$HTTPD_ROOT_PATH/www
>  # hack to suppress apache PassEnv warnings
>  GIT_VALGRIND=$GIT_VALGRIND; export GIT_VALGRIND
>  GIT_VALGRIND_OPTIONS=$GIT_VALGRIND_OPTIONS; export GIT_VALGRIND_OPTIONS
> +GIT_TEST_SIDEBAND_ALL=$GIT_TEST_SIDEBAND_ALL; export GIT_TEST_SIDEBAND_ALL
>  GIT_TRACE=$GIT_TRACE; export GIT_TRACE

I applaud your attempt to alphabetize, but the existing list is already out of order. ;) I don't think it really matters much either way, though.

-Peff