From: "Eric Sunshine via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Eric Sunshine <sunshine@sunshineco.com>,
Eric Sunshine <sunshine@sunshineco.com>
Subject: [PATCH] lib-httpd: extend module location auto-detection
Date: Mon, 21 Nov 2022 03:01:35 +0000 [thread overview]
Message-ID: <pull.1426.git.1668999695898.gitgitgadget@gmail.com> (raw)
From: Eric Sunshine <sunshine@sunshineco.com>
Although it is possible to manually set LIB_HTTPD_PATH and
LIB_HTTPD_MODULE_PATH to point at the location of `httpd` and its
modules, doing so is cumbersome and easily forgotten. To address this,
0d344738dc (t/lib-http.sh: Restructure finding of default httpd
location, 2010-01-02) enhanced lib-httpd.sh to automatically detect the
location of `httpd` and its modules in order to facilitate out-of-the-
box testing on a wider range of platforms. Follow that lead by further
enhancing it to automatically detect the `httpd` modules on Void Linux,
as well.
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
---
lib-httpd: extend module location auto-detection
Make httpd tests work out-of-the-box on Void Linux.
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1426%2Fsunshineco%2Fvoid-httpd-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1426/sunshineco/void-httpd-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/1426
t/lib-httpd.sh | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/t/lib-httpd.sh b/t/lib-httpd.sh
index 1f6b9b08d1d..5be3ee44c25 100644
--- a/t/lib-httpd.sh
+++ b/t/lib-httpd.sh
@@ -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
base-commit: a0789512c5a4ae7da935cd2e419f253cb3cb4ce7
--
gitgitgadget
next reply other threads:[~2022-11-21 3:01 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-21 3:01 Eric Sunshine via GitGitGadget [this message]
2022-11-21 19:13 ` [PATCH] lib-httpd: extend module location auto-detection Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=pull.1426.git.1668999695898.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=sunshine@sunshineco.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.