Skip to contentSkip to conversation

t/lib-httpd: pass GIT_TEST_SIDEBAND_ALL through Apache

PATCH In review Todd Zullinger 4 participants 6 messages Feb 14, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 t/lib-httpd: pass GIT_TEST_SIDEBAND_ALL through Apache

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.

---
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(+)
t/lib-httpd.sh +1 -0
index 216281eabc..0dfb48c2f6 100644
@@ -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"
Signature · 1 line
2.21.0.rc1
#1 lore raw
Quoted 8 lines · Todd Zullinger

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.

Quoted 8 lines

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

t/lib-httpd.sh HTTPD_DOCUMENT_ROOT_PATH=$HTTPD_ROOT_PATH/www · line 95

Quoted 10 lines
t/lib-httpd.sh +1 -0
index 216281eabc..0dfb48c2f6 100644
@@ -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

#2 lore raw
Quoted 15 lines · Jeff King
Quoted 13 lines · Todd Zullinger

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.

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

Quoted 6 lines
Quoted 3 lines

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.

Quoted 6 lines
Quoted 6 lines
t/lib-httpd.sh +0 -0
index 216281eabc..0dfb48c2f6 100644
@@ -91,6 +91,7 @@ HTTPD_DOCUMENT_ROOT_PATH=$HTTPD_ROOT_PATH/www
 # hack to suppress apache PassEnv warnings
Quoted 8 lines

t/lib-httpd.sh HTTPD_DOCUMENT_ROOT_PATH=$HTTPD_ROOT_PATH/www · line 95

Quoted 4 lines
t/lib-httpd.sh +1 -0
 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. ;)

Signature · 1 line
Todd
#3 lore raw
In reply to Todd Zullinger
Quoted 8 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.

Quoted 8 lines

---
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/[email protected]/

#4 lore raw
Quoted 17 lines · Jonathan Tan
Quoted 8 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.

Quoted 8 lines

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

Quoted 7 lines

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/[email protected]/

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,

Signature · 1 line
Todd
#5 lore raw
Quoted 21 lines · Todd Zullinger
Quoted 20 lines · Jonathan Tan
Quoted 8 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.

Quoted 8 lines

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

Quoted 8 lines
Quoted 4 lines

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

[1] https://public-inbox.org/git/[email protected]/

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.