{"thread":{"id":"39036","subject":"[PATCH 2/3] t/lib-git-svn: check same httpd module dirs as lib-httpd","startedAt":"2015-04-08T15:05:23Z","lastAt":"2015-05-11T11:54:20Z","messageCount":19,"participants":["Michael J Gruber","Eric Wong","Kyle J. McKay","Jeff King"],"isPatch":true,"patchVersion":1,"patchTotal":3},"messages":[{"id":"259176","messageId":"cover.1428505184.git.git@drmicha.warpmail.net","threadId":"39036","inReplyTo":null,"subject":"[PATCH 0/3] Make httpd tests run","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2015-04-08T15:05:23Z","receivedAt":"2015-04-08T15:05:23Z","isPatch":true,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"This series grew from an attempt at enlarging my personal test run coverage\non a standard Fedora 21 64bit box. Aka chain-lint fall-out.\n\nWith 1/3, I get all httpd tests to run (when port is set, of course).\n\n2/3 and 3/3 are an attempt at getting git-svn over http tests to run.\n2/3 is certainly correct but not sufficient.\n3/3 gets httpd to run but svn does not connect. This is WIP and RFH,\nand maybe requires rewriting lib-git-svn to use a config which depends\non the apache version (like lib-hhtpd does), or to leverage lib-httpd.\n\nMichael J Gruber (3):\n t/lib-httpd: load mod_unixd\n t/lib-git-svn: check same httpd module dirs as lib-httpd\n t/lib-git-svn: adjust config to apache 2.4\n\n t/lib-git-svn.sh | 7 +++++--\n t/lib-httpd/apache.conf | 3 +++\n 2 files changed, 8 insertions(+), 2 deletions(-)\n\n-- \n2.4.0.rc1.221.gf7021fb\n"},{"id":"259177","messageId":"53b238530469330255d13209c2df4f11ef5b2edc.1428505184.git.git@drmicha.warpmail.net","threadId":"39036","inReplyTo":"cover.1428505184.git.git@drmicha.warpmail.net","subject":"[PATCH 1/3] t/lib-httpd: load mod_unixd","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2015-04-08T15:05:24Z","receivedAt":"2015-04-08T15:05:24Z","isPatch":true,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"With the current config, apache 2.4.10 will not be started and the httpd\ntests will not run.\n\nEnable mod_unixd to make the httpd tests run.\n\nSigned-off-by: Michael J Gruber \n---\n\nNotes:\n Basically, this is required since the switch from 2.2 to 2.4.\n I'm wondering whether noone is running these tests, or other\n distros (than Fedora) use different default configs.\n\n t/lib-httpd/apache.conf | 3 +++\n 1 file changed, 3 insertions(+)\n\ndiff --git a/t/lib-httpd/apache.conf b/t/lib-httpd/apache.conf\nindex 0b81a00..7b8e21c 100644\n--- a/t/lib-httpd/apache.conf\n+++ b/t/lib-httpd/apache.conf\n@@ -64,6 +64,9 @@ LockFile accept.lock\n \n \tLoadModule mpm_prefork_module modules/mod_mpm_prefork.so\n \n+\n+\tLoadModule unixd_module modules/mod_unixd.so\n+\n \n \n PassEnv GIT_VALGRIND\n-- \n2.4.0.rc1.221.gf7021fb\n"},{"id":"259175","messageId":"42794bef0424d21c3ee1003e21a98fd65ed194cf.1428505184.git.git@drmicha.warpmail.net","threadId":"39036","inReplyTo":"cover.1428505184.git.git@drmicha.warpmail.net","subject":"[PATCH 2/3] t/lib-git-svn: check same httpd module dirs as lib-httpd","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2015-04-08T15:05:25Z","receivedAt":"2015-04-08T15:05:25Z","isPatch":true,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"Currently, lib-git-svn checks a proper subset of the paths that\nlib-httpd checks for apache modules.\n\nMake it check the same set so that apache is run by one when it is run\nby the other (provide ports have been set).\n\nSigned-off-by: Michael J Gruber \n---\n\nNotes:\n Again, I'm wondering how many are running these tests.\n They would not run on a 64bit system with redhat type fs layout.\n\n t/lib-git-svn.sh | 4 +++-\n 1 file changed, 3 insertions(+), 1 deletion(-)\n\ndiff --git a/t/lib-git-svn.sh b/t/lib-git-svn.sh\nindex b0ec12f..2a0ef07 100644\n--- a/t/lib-git-svn.sh\n+++ b/t/lib-git-svn.sh\n@@ -87,8 +87,10 @@ prepare_httpd () {\n \tfi\n \tfor d in \\\n \t\t\"$SVN_HTTPD_MODULE_PATH\" \\\n-\t\t/usr/lib/apache2/modules \\\n \t\t/usr/libexec/apache2 \\\n+\t\t/usr/lib/apache2/modules \\\n+\t\t/usr/lib64/httpd/modules \\\n+\t\t/usr/lib/httpd/modules \\\n \t; do\n \t\tif test -d \"$d\"\n \t\tthen\n-- \n2.4.0.rc1.221.gf7021fb\n"},{"id":"259178","messageId":"0631c09d394dedb803a100e81ce4052a57b4e73e.1428505184.git.git@drmicha.warpmail.net","threadId":"39036","inReplyTo":"cover.1428505184.git.git@drmicha.warpmail.net","subject":"[WIP/RFH/PATCH 3/3] t/lib-git-svn: adjust config to apache 2.4","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2015-04-08T15:05:26Z","receivedAt":"2015-04-08T15:05:26Z","isPatch":true,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"The current config is tailored to apache 2.2. Apache 2.4 fails to start\nwith it.\n\nAdjust the config to apache 2.4.\n\nSigned-off-by: Michael J Gruber \n---\n\nNotes:\n This is WIP and RFH. Apache does not start without mpm, and the lock\n mechanism has changed. It will run with these changes, but svn fails to\n connect.\n \n Again, I'm wondering who is running these tests at all, but also:\n Why do we leverage lib-httpd so little from lib-git-svn?\n\n t/lib-git-svn.sh | 3 ++-\n 1 file changed, 2 insertions(+), 1 deletion(-)\n\ndiff --git a/t/lib-git-svn.sh b/t/lib-git-svn.sh\nindex 2a0ef07..b0ca893 100644\n--- a/t/lib-git-svn.sh\n+++ b/t/lib-git-svn.sh\n@@ -117,10 +117,11 @@ ServerName \"git svn test\"\n ServerRoot \"$GIT_DIR\"\n DocumentRoot \"$GIT_DIR\"\n PidFile \"$GIT_DIR/httpd.pid\"\n-LockFile logs/accept.lock\n+Mutex default\n Listen 127.0.0.1:$SVN_HTTPD_PORT\n LoadModule dav_module $SVN_HTTPD_MODULE_PATH/mod_dav.so\n LoadModule dav_svn_module $SVN_HTTPD_MODULE_PATH/mod_dav_svn.so\n+LoadModule mpm_prefork_module $SVN_HTTPD_MODULE_PATH/mod_mpm_prefork.so\n \n \tDAV svn\n \tSVNPath \"$rawsvnrepo\"\n-- \n2.4.0.rc1.221.gf7021fb\n"},{"id":"259185","messageId":"20150408202615.GA12154@dcvr.yhbt.net","threadId":"39036","inReplyTo":"0631c09d394dedb803a100e81ce4052a57b4e73e.1428505184.git.git@drmicha.warpmail.net","subject":"Re: [WIP/RFH/PATCH 3/3] t/lib-git-svn: adjust config to apache 2.4","fromName":"Eric Wong","fromEmail":"normalperson@yhbt.net","sentAt":"2015-04-08T20:26:15Z","receivedAt":"2015-04-08T20:26:15Z","isPatch":true,"sender":{"key":"e@80x24.org","avatar":null},"body":"Michael J Gruber wrote:\n> The current config is tailored to apache 2.2. Apache 2.4 fails to start\n> with it.\n> \n> Adjust the config to apache 2.4.\n> \n> Signed-off-by: Michael J Gruber \n> ---\n\n1/3 and 2/3 tested fine on Debian stable (wheezy).\nYou can add my Tested-by to 1/3 and my S-o-b to 2/3.\n\n...but not this one.\n\n> Notes:\n> This is WIP and RFH. Apache does not start without mpm, and the lock\n> mechanism has changed. It will run with these changes, but svn fails to\n> connect.\n> \n> Again, I'm wondering who is running these tests at all, but also:\n> Why do we leverage lib-httpd so little from lib-git-svn?\n\nI'm only testing on Apache 2.2 (from Debian stable (wheezy)).\n\nI doubt anybody here, myself included, likes dealing with SVN,\nand would rather ignore the tests than try to fix them.\n\nlib-git-svn predates lib-httpd, and it isn't very interesting work\nto port and cleanup.\n\n> +LoadModule mpm_prefork_module $SVN_HTTPD_MODULE_PATH/mod_mpm_prefork.so\n\nI think you need an IfModule guard around this?\n\nI have no mod_mpm_prefork.so file with the apache2-mpm-prefork\n(2.2.22-13+deb7u4) package on Debian wheezy.\n"},{"id":"259200","messageId":"55264615.2050107@drmicha.warpmail.net","threadId":"39036","inReplyTo":"5525A208.6060807@web.de","subject":"Re: [PATCH 1/3] t/lib-httpd: load mod_unixd","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2015-04-09T09:27:49Z","receivedAt":"2015-04-09T09:27:49Z","isPatch":true,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"Torsten Bögershausen venit, vidit, dixit 08.04.2015 23:47:\n> On 2015-04-08 17.05, Michael J Gruber wrote:\n>> With the current config, apache 2.4.10 will not be started and the httpd\n>> tests will not run.\n>>\n>> Enable mod_unixd to make the httpd tests run.\n>>\n>> Signed-off-by: Michael J Gruber \n>> ---\n>>\n>> Notes:\n>> Basically, this is required since the switch from 2.2 to 2.4.\n>> I'm wondering whether noone is running these tests, or other\n>> distros (than Fedora) use different default configs.\n> Do you have any special test numbers in mind ?\n> The following are running under Debian:\n> \n> *** t5541-http-push-smart.sh ***\n> *** t5542-push-http-shallow.sh ***\n> *** t5550-http-fetch-dumb.sh ***\n> *** t5551-http-fetch-smart.sh ***\n> *** t5560-http-backend-noserver.sh ***\n> \n> (Then I stopped digging)\n> \n> And this under Mac OS, \n> *** t5541-http-push-smart.sh ***\n> You do not seem to have gpg installed\n> ok 1 - setup remote repository\n> ....\n\nIs this with apache 2.4?\n\nIn my case (apache 2.4, fedora 21), t/lib-http.sh failed to start the\nweb server, so the tests above would (succeed trivially but) not run.\n\nMaybe debian is using an apache default config that has mod_unixd built\nin, to ease the transition from apache 2.2? Many were bitten by these\nnew requirements after the switch to 2.4, and some distros may have\nworked around that.\n\nDo your tests run with this patch applied?\n\nMichael\n"},{"id":"259201","messageId":"55264763.6050703@drmicha.warpmail.net","threadId":"39036","inReplyTo":"20150408202615.GA12154@dcvr.yhbt.net","subject":"Re: [WIP/RFH/PATCH 3/3] t/lib-git-svn: adjust config to apache 2.4","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2015-04-09T09:33:23Z","receivedAt":"2015-04-09T09:33:23Z","isPatch":true,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"Eric Wong venit, vidit, dixit 08.04.2015 22:26:\n> Michael J Gruber wrote:\n>> The current config is tailored to apache 2.2. Apache 2.4 fails to start\n>> with it.\n>>\n>> Adjust the config to apache 2.4.\n>>\n>> Signed-off-by: Michael J Gruber \n>> ---\n> \n> 1/3 and 2/3 tested fine on Debian stable (wheezy).\n> You can add my Tested-by to 1/3 and my S-o-b to 2/3.\n\nThanks, that's good to know.\n\n> ...but not this one.\n> \n>> Notes:\n>> This is WIP and RFH. Apache does not start without mpm, and the lock\n>> mechanism has changed. It will run with these changes, but svn fails to\n>> connect.\n>> \n>> Again, I'm wondering who is running these tests at all, but also:\n>> Why do we leverage lib-httpd so little from lib-git-svn?\n> \n> I'm only testing on Apache 2.2 (from Debian stable (wheezy)).\n\nSo debian stable has apache 2.2? That explains why many don't see these\nproblems.\n\n> I doubt anybody here, myself included, likes dealing with SVN,\n> and would rather ignore the tests than try to fix them.\n> \n> lib-git-svn predates lib-httpd, and it isn't very interesting work\n> to port and cleanup.\n\nI agree with everything above. But if (and that's a big if) the tests\ndon't run for anyone I'd rather remove them if there's no way to port them.\n\n>> +LoadModule mpm_prefork_module $SVN_HTTPD_MODULE_PATH/mod_mpm_prefork.so\n> \n> I think you need an IfModule guard around this?\n> \n> I have no mod_mpm_prefork.so file with the apache2-mpm-prefork\n> (2.2.22-13+deb7u4) package on Debian wheezy.\n\nSure, the changes in 3/3 are for apache 2.4 only and should be guarded\nby a version check the same way as the ones in lib-httpd.\n\nI'm just trying to figure out how to run them at all first.\n\nSo, before 3/3, t9118 and such do run the web server and test git-svn\nagainst that for you?\n\nMichael\n"},{"id":"259205","messageId":"3997B1B0-98C0-4408-B82E-85BBD78732FD@gmail.com","threadId":"39036","inReplyTo":"cover.1428505184.git.git@drmicha.warpmail.net","subject":"Re: [PATCH 0/3] Make httpd tests run","fromName":"Kyle J. McKay","fromEmail":"mackyle@gmail.com","sentAt":"2015-04-09T13:04:31Z","receivedAt":"2015-04-09T13:04:31Z","isPatch":true,"sender":{"key":"mackyle@gmail.com","avatar":"https://avatars.githubusercontent.com/u/813346?v=4"},"body":"On Apr 8, 2015, at 08:05, Michael J Gruber wrote:\n\n> This series grew from an attempt at enlarging my personal test run \n> coverage\n> on a standard Fedora 21 64bit box. Aka chain-lint fall-out.\n>\n> With 1/3, I get all httpd tests to run (when port is set, of course).\n>\n> 2/3 and 3/3 are an attempt at getting git-svn over http tests to run.\n> 2/3 is certainly correct but not sufficient.\n> 3/3 gets httpd to run but svn does not connect. This is WIP and RFH,\n> and maybe requires rewriting lib-git-svn to use a config which depends\n> on the apache version (like lib-hhtpd does), or to leverage lib-httpd.\n>\n> Michael J Gruber (3):\n> t/lib-httpd: load mod_unixd\n> t/lib-git-svn: check same httpd module dirs as lib-httpd\n> t/lib-git-svn: adjust config to apache 2.4\n\nThe changes in this series appear to break compatibility with Apache \n2.2.\n\nDoes that mean that Apache 2.2 is no longer supported for running \nthese tests?\n\nOr am I missing something here...\n\n-Kyle\n"},{"id":"259206","messageId":"0727016B-E495-4577-A174-E0EA85910BD3@gmail.com","threadId":"39036","inReplyTo":"3997B1B0-98C0-4408-B82E-85BBD78732FD@gmail.com","subject":"Re: [PATCH 0/3] Make httpd tests run","fromName":"Kyle J. McKay","fromEmail":"mackyle@gmail.com","sentAt":"2015-04-09T13:14:49Z","receivedAt":"2015-04-09T13:14:49Z","isPatch":true,"sender":{"key":"mackyle@gmail.com","avatar":"https://avatars.githubusercontent.com/u/813346?v=4"},"body":"On Apr 9, 2015, at 06:04, Kyle J. McKay wrote:\n\n> On Apr 8, 2015, at 08:05, Michael J Gruber wrote:\n>\n>> This series grew from an attempt at enlarging my personal test run \n>> coverage\n>> on a standard Fedora 21 64bit box. Aka chain-lint fall-out.\n>>\n>> With 1/3, I get all httpd tests to run (when port is set, of course).\n>>\n>> 2/3 and 3/3 are an attempt at getting git-svn over http tests to run.\n>> 2/3 is certainly correct but not sufficient.\n>> 3/3 gets httpd to run but svn does not connect. This is WIP and RFH,\n>> and maybe requires rewriting lib-git-svn to use a config which \n>> depends\n>> on the apache version (like lib-hhtpd does), or to leverage lib- \n>> httpd.\n>>\n>> Michael J Gruber (3):\n>> t/lib-httpd: load mod_unixd\n>> t/lib-git-svn: check same httpd module dirs as lib-httpd\n>> t/lib-git-svn: adjust config to apache 2.4\n>\n> The changes in this series appear to break compatibility with Apache \n> 2.2.\n>\n> Does that mean that Apache 2.2 is no longer supported for running \n> these tests?\n>\n> Or am I missing something here...\n\nNever mind. I see the they're wrapped in now. Would \nhave been nice if they were indented so there was a hint about that in \nthe diff, or the diff included enough context to see that. But that \nfile formatting has nothing to do with your change.\n\nSorry for the noise.\n\n-Kyle\n"},{"id":"259211","messageId":"20150409191123.GA1931@dcvr.yhbt.net","threadId":"39036","inReplyTo":"55264763.6050703@drmicha.warpmail.net","subject":"Re: [WIP/RFH/PATCH 3/3] t/lib-git-svn: adjust config to apache 2.4","fromName":"Eric Wong","fromEmail":"normalperson@yhbt.net","sentAt":"2015-04-09T19:11:23Z","receivedAt":"2015-04-09T19:11:23Z","isPatch":true,"sender":{"key":"e@80x24.org","avatar":null},"body":"Michael J Gruber wrote:\n> So debian stable has apache 2.2? That explains why many don't see these\n> problems.\n\nRight.\n\n> So, before 3/3, t9118 and such do run the web server and test git-svn\n> against that for you?\n\nYes.\n"},{"id":"259216","messageId":"20150410030913.GA11280@peff.net","threadId":"39036","inReplyTo":"55264615.2050107@drmicha.warpmail.net","subject":"Re: [PATCH 1/3] t/lib-httpd: load mod_unixd","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2015-04-10T03:09:14Z","receivedAt":"2015-04-10T03:09:14Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Thu, Apr 09, 2015 at 11:27:49AM +0200, Michael J Gruber wrote:\n\n> In my case (apache 2.4, fedora 21), t/lib-http.sh failed to start the\n> web server, so the tests above would (succeed trivially but) not run.\n> \n> Maybe debian is using an apache default config that has mod_unixd built\n> in, to ease the transition from apache 2.2? Many were bitten by these\n> new requirements after the switch to 2.4, and some distros may have\n> worked around that.\n\nYes, this is exactly it. On my Debian system:\n\n $ apache2 -l\n Compiled in modules:\n core.c\n mod_so.c\n mod_watchdog.c\n http_core.c\n mod_log_config.c\n mod_logio.c\n mod_version.c\n mod_unixd.c\n\n> Do your tests run with this patch applied?\n\nYes. I think your patch is fine, as the IfModule means we handle both\nthe built-in and dynamic cases.\n\n-Peff\n"},{"id":"259217","messageId":"20150410032317.GB11280@peff.net","threadId":"39036","inReplyTo":"0631c09d394dedb803a100e81ce4052a57b4e73e.1428505184.git.git@drmicha.warpmail.net","subject":"Re: [WIP/RFH/PATCH 3/3] t/lib-git-svn: adjust config to apache 2.4","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2015-04-10T03:23:17Z","receivedAt":"2015-04-10T03:23:17Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Wed, Apr 08, 2015 at 05:05:26PM +0200, Michael J Gruber wrote:\n\n> The current config is tailored to apache 2.2. Apache 2.4 fails to start\n> with it.\n> \n> Adjust the config to apache 2.4.\n\nI think this needs more conditional config. See the similar fixes I did\nin:\n\n 296f0b3 (t/lib-httpd/apache.conf: configure an MPM module for apache\n 2.4, 2013-06-09)\n\nand:\n\n 0442743 (t/lib-httpd/apache.conf: do not use LockFile in apache >=\n 2.4, 2013-06-09)\n\nAnd also beware of the ordering problem fixed by:\n\n 5bdc47e (lib-httpd/apache.conf: check version only after mod_version\n loads, 2013-06-21)\n\nCuriously, though, the git-svn tests seem to run fine for me on Apache\n2.4 without your patch. I wonder if the fixes I mentioned above (which I\ndefinitely needed to get the regular http tests running on Debian back\nthen) are not necessary on my system anymore (e.g., because the apache2\npackage now ships with better-compatible config).\n\n> Again, I'm wondering who is running these tests at all, but also:\n\nI run the http tests regularly (and have for a long time). I don't\nusually run the svn tests, though.\n\n> Why do we leverage lib-httpd so little from lib-git-svn?\n\nI don't mind us doing the minimal work here to bring the svn tests to a\nworking state for your platform. As Eric mentions, refactoring test\ninfrastructure is boring and thankless work. :)\n\nBut an alternate solution for patches 2 and 3 might be to share more of\nthe startup code and config between the two. I don't know how painful\nthat would be. From a cursory look, I think t/lib-httpd/apache.conf\nwould have to get split into two parts: one to get apache running at\nall, and one to setup the and other bits related directly to\nthe http tests.\n\n-Peff\n"},{"id":"259218","messageId":"20150410033953.GC11280@peff.net","threadId":"39036","inReplyTo":"20150410032317.GB11280@peff.net","subject":"Re: [WIP/RFH/PATCH 3/3] t/lib-git-svn: adjust config to apache 2.4","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2015-04-10T03:39:54Z","receivedAt":"2015-04-10T03:39:54Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Fri, Apr 10, 2015 at 05:23:17AM +0200, Jeff King wrote:\n\n> Curiously, though, the git-svn tests seem to run fine for me on Apache\n> 2.4 without your patch. I wonder if the fixes I mentioned above (which I\n> definitely needed to get the regular http tests running on Debian back\n> then) are not necessary on my system anymore (e.g., because the apache2\n> package now ships with better-compatible config).\n\nAh, I see. I am not in fact running apache.\n\nIf you do not set SVN_HTTPD_PORT (which I don't), then lib-git-svn.sh's\nstart_httpd silently returns success without bothering to setup the\napache server at all. And yet the rest of the tests run to completion\njust fine.\n\nIt looks like setting this variable is a way to say \"run the same set of\ntests, but do it over svn-over-httpd instead of svn's direct filesystem\naccess\". Setting SVN_HTTPD_PORT does cause the tests to fail for me.\n\nI don't know how important it is to run these tests over httpd. If so,\nit would be nice to do something like lib-httpd does: try the apache\nsetup by default, and if it fails, gracefully skip the tests (or\nfallback to the non-httpd version).\n\nI'm also not sure if there's value in running both the httpd and\nlocal-filesystem forms of the test. IOW, should we be factoring out the\ntests and having two separate scripts that set $svnrepo as appropriate,\nand then runs the tests?\n\n-Peff\n"},{"id":"259284","messageId":"552B96F5.8060607@drmicha.warpmail.net","threadId":"39036","inReplyTo":"20150410033953.GC11280@peff.net","subject":"Re: [WIP/RFH/PATCH 3/3] t/lib-git-svn: adjust config to apache 2.4","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2015-04-13T10:14:13Z","receivedAt":"2015-04-13T10:14:13Z","isPatch":true,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"Jeff King venit, vidit, dixit 10.04.2015 05:39:\n> On Fri, Apr 10, 2015 at 05:23:17AM +0200, Jeff King wrote:\n> \n>> Curiously, though, the git-svn tests seem to run fine for me on Apache\n>> 2.4 without your patch. I wonder if the fixes I mentioned above (which I\n>> definitely needed to get the regular http tests running on Debian back\n>> then) are not necessary on my system anymore (e.g., because the apache2\n>> package now ships with better-compatible config).\n> \n> Ah, I see. I am not in fact running apache.\n> \n> If you do not set SVN_HTTPD_PORT (which I don't), then lib-git-svn.sh's\n> start_httpd silently returns success without bothering to setup the\n> apache server at all. And yet the rest of the tests run to completion\n> just fine.\n\nYep.\n\n> It looks like setting this variable is a way to say \"run the same set of\n> tests, but do it over svn-over-httpd instead of svn's direct filesystem\n> access\". Setting SVN_HTTPD_PORT does cause the tests to fail for me.\n\nOh, I didn't even notice that. That's a bit weird.\n\n> I don't know how important it is to run these tests over httpd. If so,\n> it would be nice to do something like lib-httpd does: try the apache\n> setup by default, and if it fails, gracefully skip the tests (or\n> fallback to the non-httpd version).\n> \n> I'm also not sure if there's value in running both the httpd and\n> local-filesystem forms of the test. IOW, should we be factoring out the\n> tests and having two separate scripts that set $svnrepo as appropriate,\n> and then runs the tests?\n> \n> -Peff\n\nHmm, if those tests are run (with file://) I'm inclined to leave things\nas they are (scratch 3/3)... Though the fact that on my system,\nlib-git-svn starts the server but fails to connect isn't overly\ncomforting. But git-svn is being used less and less. World domination is\nalmost complete.\n\nMichael\n"},{"id":"260969","messageId":"cover.1431344881.git.git@drmicha.warpmail.net","threadId":"39036","inReplyTo":"0727016B-E495-4577-A174-E0EA85910BD3@gmail.com","subject":"[PATCHv2 0/4] Make httpd tests run v2","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2015-05-11T11:54:16Z","receivedAt":"2015-05-11T11:54:16Z","isPatch":false,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"v2 updates the commit messages as per the dicsussion after v1 and adds a\nclean-up.\n\n1/4, 2/4 are ready to go as discussed (commit messages updated).\n3/4 is a new independent cleanup noted while being there.\n4/4 is the old 3/3 and still WIP. Please hold back.\n\nMichael J Gruber (4):\n t/lib-httpd: load mod_unixd\n t/lib-git-svn: check same httpd module dirs as lib-httpd\n t/t91*: donot say how to avoid the tests\n t/lib-git-svn: adjust config to apache 2.4 WIP\n\n t/lib-git-svn.sh | 17 +++++++++++++++--\n t/lib-httpd/apache.conf | 3 +++\n t/t9100-git-svn-basic.sh | 2 --\n t/t9158-git-svn-mergeinfo.sh | 2 --\n t/t9160-git-svn-preserve-empty-dirs.sh | 1 -\n 5 files changed, 18 insertions(+), 7 deletions(-)\n\n-- \n2.4.0.rc3.332.g886447c\n"},{"id":"260965","messageId":"e0e9ff212442929cf5e29a8105ae280785a070f5.1431344881.git.git@drmicha.warpmail.net","threadId":"39036","inReplyTo":"0727016B-E495-4577-A174-E0EA85910BD3@gmail.com","subject":"[PATCHv2 1/4] t/lib-httpd: load mod_unixd","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2015-05-11T11:54:17Z","receivedAt":"2015-05-11T11:54:17Z","isPatch":false,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"In contrast to apache 2.2, apache 2.4 does not load mod_unixd in its\ndefault configuration (because there are choices). Thus, with the\ncurrent config, apache 2.4.10 will not be started and the httpd tests\nwill not run on distros with default apache config (RedHat type).\n\nEnable mod_unixd to make the httpd tests run. This does not affect\ndistros negatively which have that config already in their default\n(Debian type). httpd tests will run on these before and after this patch.\n\nSigned-off-by: Michael J Gruber \n---\n t/lib-httpd/apache.conf | 3 +++\n 1 file changed, 3 insertions(+)\n\ndiff --git a/t/lib-httpd/apache.conf b/t/lib-httpd/apache.conf\nindex 0b81a00..7b8e21c 100644\n--- a/t/lib-httpd/apache.conf\n+++ b/t/lib-httpd/apache.conf\n@@ -64,6 +64,9 @@ LockFile accept.lock\n \n \tLoadModule mpm_prefork_module modules/mod_mpm_prefork.so\n \n+\n+\tLoadModule unixd_module modules/mod_unixd.so\n+\n \n \n PassEnv GIT_VALGRIND\n-- \n2.4.0.rc3.332.g886447c\n"},{"id":"260967","messageId":"9b17de0c04230ecf2a72d8669891eaee2ffda053.1431344881.git.git@drmicha.warpmail.net","threadId":"39036","inReplyTo":"0727016B-E495-4577-A174-E0EA85910BD3@gmail.com","subject":"[PATCHv2 2/4] t/lib-git-svn: check same httpd module dirs as lib-httpd","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2015-05-11T11:54:18Z","receivedAt":"2015-05-11T11:54:18Z","isPatch":false,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"Currently, lib-git-svn checks a proper subset of the paths that\nlib-httpd checks for apache modules.\n\nMake it check the same set so that apache is run by one when it is run\nby the other (provided ports have been set and there are no other\nconfiguration issues).\n\nSigned-off-by: Michael J Gruber \n---\n t/lib-git-svn.sh | 4 +++-\n 1 file changed, 3 insertions(+), 1 deletion(-)\n\ndiff --git a/t/lib-git-svn.sh b/t/lib-git-svn.sh\nindex b0ec12f..2a0ef07 100644\n--- a/t/lib-git-svn.sh\n+++ b/t/lib-git-svn.sh\n@@ -87,8 +87,10 @@ prepare_httpd () {\n \tfi\n \tfor d in \\\n \t\t\"$SVN_HTTPD_MODULE_PATH\" \\\n-\t\t/usr/lib/apache2/modules \\\n \t\t/usr/libexec/apache2 \\\n+\t\t/usr/lib/apache2/modules \\\n+\t\t/usr/lib64/httpd/modules \\\n+\t\t/usr/lib/httpd/modules \\\n \t; do\n \t\tif test -d \"$d\"\n \t\tthen\n-- \n2.4.0.rc3.332.g886447c\n"},{"id":"260966","messageId":"9d6d4650dda2044f970916619670bded8fe9c9ed.1431344881.git.git@drmicha.warpmail.net","threadId":"39036","inReplyTo":"0727016B-E495-4577-A174-E0EA85910BD3@gmail.com","subject":"[PATCH 3/4] t/t91*: do not say how to avoid the tests","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2015-05-11T11:54:19Z","receivedAt":"2015-05-11T11:54:19Z","isPatch":true,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"Some of the tests \"say\" how to stop the svn tests from running, some do\nnot.\n\nThe test suite is directed at people reading t/README where we keep all\ninformation about running the test suite (partly, with options etc.).\n\nRemove said \"say\" occurences.\n\nSigned-off-by: Michael J Gruber \n---\n\nNotes:\n Note on the side while messing with svn tests.\n\n t/t9100-git-svn-basic.sh | 2 --\n t/t9158-git-svn-mergeinfo.sh | 2 --\n t/t9160-git-svn-preserve-empty-dirs.sh | 1 -\n 3 files changed, 5 deletions(-)\n\ndiff --git a/t/t9100-git-svn-basic.sh b/t/t9100-git-svn-basic.sh\nindex 4fea8d9..3e34b42 100755\n--- a/t/t9100-git-svn-basic.sh\n+++ b/t/t9100-git-svn-basic.sh\n@@ -8,8 +8,6 @@ GIT_SVN_LC_ALL=${LC_ALL:-$LANG}\n \n . ./lib-git-svn.sh\n \n-say 'define NO_SVN_TESTS to skip git svn tests'\n-\n case \"$GIT_SVN_LC_ALL\" in\n *.UTF-8)\n \ttest_set_prereq UTF8\ndiff --git a/t/t9158-git-svn-mergeinfo.sh b/t/t9158-git-svn-mergeinfo.sh\nindex 13f78f2..a875b45 100755\n--- a/t/t9158-git-svn-mergeinfo.sh\n+++ b/t/t9158-git-svn-mergeinfo.sh\n@@ -7,8 +7,6 @@ test_description='git svn mergeinfo propagation'\n \n . ./lib-git-svn.sh\n \n-say 'define NO_SVN_TESTS to skip git svn tests'\n-\n test_expect_success 'initialize source svn repo' '\n \tsvn_cmd mkdir -m x \"$svnrepo\"/trunk &&\n \tsvn_cmd co \"$svnrepo\"/trunk \"$SVN_TREE\" &&\ndiff --git a/t/t9160-git-svn-preserve-empty-dirs.sh b/t/t9160-git-svn-preserve-empty-dirs.sh\nindex b4a4434..0ede3cf 100755\n--- a/t/t9160-git-svn-preserve-empty-dirs.sh\n+++ b/t/t9160-git-svn-preserve-empty-dirs.sh\n@@ -11,7 +11,6 @@ local Git repository with placeholder files.'\n \n . ./lib-git-svn.sh\n \n-say 'define NO_SVN_TESTS to skip git svn tests'\n GIT_REPO=git-svn-repo\n \n test_expect_success 'initialize source svn repo containing empty dirs' '\n-- \n2.4.0.rc3.332.g886447c\n"},{"id":"260968","messageId":"5973b74b00301c25ca956764981ec032a863ca07.1431344881.git.git@drmicha.warpmail.net","threadId":"39036","inReplyTo":"0727016B-E495-4577-A174-E0EA85910BD3@gmail.com","subject":"[PATCHv2 4/4 (was 3/3, still WIP)] t/lib-git-svn: adjust config to apache 2.4 WIP","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2015-05-11T11:54:20Z","receivedAt":"2015-05-11T11:54:20Z","isPatch":false,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"The current config is tailored to apache 2.2. Apache 2.4 fails to start\nwith it.\n\nAdjust the config to apache 2.4. [still incomplete]\n\nSigned-off-by: Michael J Gruber \n---\n\nNotes:\n This is WIP and RFH. Apache does not start without mpm, and the lock\n mechanism has changed. It will run with these changes, but svn fails to\n connect.\n \n Again, I'm wondering who is running these tests at all, but also:\n Why do we leverage lib-httpd so little from lib-git-svn?\n\n t/lib-git-svn.sh | 13 ++++++++++++-\n 1 file changed, 12 insertions(+), 1 deletion(-)\n\ndiff --git a/t/lib-git-svn.sh b/t/lib-git-svn.sh\nindex 2a0ef07..24ad8b4 100644\n--- a/t/lib-git-svn.sh\n+++ b/t/lib-git-svn.sh\n@@ -117,10 +117,21 @@ ServerName \"git svn test\"\n ServerRoot \"$GIT_DIR\"\n DocumentRoot \"$GIT_DIR\"\n PidFile \"$GIT_DIR/httpd.pid\"\n-LockFile logs/accept.lock\n Listen 127.0.0.1:$SVN_HTTPD_PORT\n LoadModule dav_module $SVN_HTTPD_MODULE_PATH/mod_dav.so\n LoadModule dav_svn_module $SVN_HTTPD_MODULE_PATH/mod_dav_svn.so\n+\n+ LoadModule version_module $SVN_HTTPD_MODULE_PATH/mod_version.so\n+\n+\n+LockFile logs/accept.lock\n+\n+= 2.4>\n+Mutex default\n+\n+\tLoadModule mpm_prefork_module $SVN_HTTPD_MODULE_PATH/mod_mpm_prefork.so\n+\n+\n \n \tDAV svn\n \tSVNPath \"$rawsvnrepo\"\n-- \n2.4.0.rc3.332.g886447c\n"}]}