]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'es/locate-httpd-module-location-in-test'
authorJunio C Hamano <gitster@pobox.com>
Mon, 28 Nov 2022 03:13:45 +0000 (12:13 +0900)
committerJunio C Hamano <gitster@pobox.com>
Mon, 28 Nov 2022 03:13:45 +0000 (12:13 +0900)
Add one more candidate directory that may house httpd modules while
running tests.

* es/locate-httpd-module-location-in-test:
  lib-httpd: extend module location auto-detection

t/lib-httpd.sh

index ba9fe36772ac318cab7170671c33e2cf38102786..608949ea80b9a90cd00fcde239e7a39e21184f29 100644 (file)
@@ -65,7 +65,8 @@ done
 for DEFAULT_HTTPD_MODULE_PATH in '/usr/libexec/apache2' \
                                 '/usr/lib/apache2/modules' \
                                 '/usr/lib64/httpd/modules' \
-                                '/usr/lib/httpd/modules'
+                                '/usr/lib/httpd/modules' \
+                                '/usr/libexec/httpd'
 do
        if test -d "$DEFAULT_HTTPD_MODULE_PATH"
        then