git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / Atom feed
* [PATCH] t/lib-httpd: pass GIT_TEST_SIDEBAND_ALL through Apache
@ 2019-02-14  6:35 Todd Zullinger
  2019-02-14  6:52 ` Jeff King
  2019-02-14 20:17 ` Jonathan Tan
  0 siblings, 2 replies; 6+ messages in thread
From: Todd Zullinger @ 2019-02-14  6:35 UTC (permalink / raw)
  To: git; +Cc: Jonathan Tan, Junio C Hamano, Jeff King

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.

 t/lib-httpd.sh | 1 +
 1 file changed, 1 insertion(+)

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
 
 if ! test -x "$LIB_HTTPD_PATH"
-- 
2.21.0.rc1


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] t/lib-httpd: pass GIT_TEST_SIDEBAND_ALL through Apache
  2019-02-14  6:35 [PATCH] t/lib-httpd: pass GIT_TEST_SIDEBAND_ALL through Apache Todd Zullinger
@ 2019-02-14  6:52 ` Jeff King
  2019-02-14  7:00   ` Todd Zullinger
  2019-02-14 20:17 ` Jonathan Tan
  1 sibling, 1 reply; 6+ messages in thread
From: Jeff King @ 2019-02-14  6:52 UTC (permalink / raw)
  To: Todd Zullinger; +Cc: git, Jonathan Tan, Junio C Hamano

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

> 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).

> 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

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] t/lib-httpd: pass GIT_TEST_SIDEBAND_ALL through Apache
  2019-02-14  6:52 ` Jeff King
@ 2019-02-14  7:00   ` Todd Zullinger
  0 siblings, 0 replies; 6+ messages in thread
From: Todd Zullinger @ 2019-02-14  7:00 UTC (permalink / raw)
  To: Jeff King; +Cc: git, Jonathan Tan, Junio C Hamano

Jeff King wrote:
> On Thu, Feb 14, 2019 at 01:35:13AM -0500, Todd Zullinger wrote:
> 
>> 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).

Excellent, thanks.

>> 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.

It's like a tar pit for catching people with a little OCD.

I debated whether to add it at the end, sort them all in a
prep patch, or just add it after GIT_TRACE.  I'm not sure if
I should even admit to spending as much time debating it
with myself as I did. ;)

-- 
Todd

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] t/lib-httpd: pass GIT_TEST_SIDEBAND_ALL through Apache
  2019-02-14  6:35 [PATCH] t/lib-httpd: pass GIT_TEST_SIDEBAND_ALL through Apache Todd Zullinger
  2019-02-14  6:52 ` Jeff King
@ 2019-02-14 20:17 ` Jonathan Tan
  2019-02-14 20:47   ` Todd Zullinger
  1 sibling, 1 reply; 6+ messages in thread
From: Jonathan Tan @ 2019-02-14 20:17 UTC (permalink / raw)
  To: tmz; +Cc: git, jonathantanmy, gitster, peff

> 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.

Thanks for looking into this. I think this is the right way to do it
too.

Previous discussion here [1] but I don't think any patches came out of
that.

[1] https://public-inbox.org/git/20190129232732.GB218214@google.com/

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] t/lib-httpd: pass GIT_TEST_SIDEBAND_ALL through Apache
  2019-02-14 20:17 ` Jonathan Tan
@ 2019-02-14 20:47   ` Todd Zullinger
  2019-02-14 21:20     ` Junio C Hamano
  0 siblings, 1 reply; 6+ messages in thread
From: Todd Zullinger @ 2019-02-14 20:47 UTC (permalink / raw)
  To: Jonathan Tan; +Cc: git, gitster, peff, Jonathan Nieder, SZEDER Gábor

Jonathan Tan wrote:
>> 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.
> 
> Thanks for looking into this. I think this is the right way to do it
> too.
> 
> Previous discussion here [1] but I don't think any patches came out of
> that.
> 
> [1] https://public-inbox.org/git/20190129232732.GB218214@google.com/

Hah.  Somehow I missed that thread and Jeff's reply barely
24 hours before I sent this.  Hopefully this saves Jonathan
Nieder a few minutes of patch prep & testing.

Thanks,

-- 
Todd

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] t/lib-httpd: pass GIT_TEST_SIDEBAND_ALL through Apache
  2019-02-14 20:47   ` Todd Zullinger
@ 2019-02-14 21:20     ` Junio C Hamano
  0 siblings, 0 replies; 6+ messages in thread
From: Junio C Hamano @ 2019-02-14 21:20 UTC (permalink / raw)
  To: Todd Zullinger
  Cc: Jonathan Tan, git, peff, Jonathan Nieder, SZEDER Gábor

Todd Zullinger <tmz@pobox.com> writes:

> Jonathan Tan wrote:
>>> 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.
>> 
>> Thanks for looking into this. I think this is the right way to do it
>> too.
>> 
>> Previous discussion here [1] but I don't think any patches came out of
>> that.
>> 
>> [1] https://public-inbox.org/git/20190129232732.GB218214@google.com/
>
> Hah.  Somehow I missed that thread and Jeff's reply barely
> 24 hours before I sent this.  Hopefully this saves Jonathan
> Nieder a few minutes of patch prep & testing.

Thanks, will queue in the meantime, and let's aim for -rc2.

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, back to index

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-02-14  6:35 [PATCH] t/lib-httpd: pass GIT_TEST_SIDEBAND_ALL through Apache Todd Zullinger
2019-02-14  6:52 ` Jeff King
2019-02-14  7:00   ` Todd Zullinger
2019-02-14 20:17 ` Jonathan Tan
2019-02-14 20:47   ` Todd Zullinger
2019-02-14 21:20     ` Junio C Hamano

git@vger.kernel.org list mirror (unofficial, one of many)

Archives are clonable:
	git clone --mirror https://public-inbox.org/git
	git clone --mirror http://ou63pmih66umazou.onion/git
	git clone --mirror http://czquwvybam4bgbro.onion/git
	git clone --mirror http://hjrcffqmbrq6wope.onion/git

Newsgroups are available over NNTP:
	nntp://news.public-inbox.org/inbox.comp.version-control.git
	nntp://ou63pmih66umazou.onion/inbox.comp.version-control.git
	nntp://czquwvybam4bgbro.onion/inbox.comp.version-control.git
	nntp://hjrcffqmbrq6wope.onion/inbox.comp.version-control.git
	nntp://news.gmane.org/gmane.comp.version-control.git

 note: .onion URLs require Tor: https://www.torproject.org/

AGPL code for this site: git clone https://public-inbox.org/ public-inbox