diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-02-09 14:40:46 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-02-09 14:40:47 -0800 |
| commit | a674c7edcf34ca41c814ac7a7425d10c5bc371ec (patch) | |
| tree | d5482647573a07337dd793db50c4270da4ac5ab7 /t/lib-httpd.sh | |
| parent | 2c91b13751308f47043f23d224dbc1215e42f16b (diff) | |
| parent | b08edf709dfcd79c3691370930cd89c4b9b16d2f (diff) | |
Merge branch 'jk/httpd-test-updates'
Test update.
* jk/httpd-test-updates:
t/lib-httpd: increase ssl key size to 2048 bits
t/lib-httpd: drop SSLMutex config
t/lib-httpd: bump required apache version to 2.4
t/lib-httpd: bump required apache version to 2.2
Diffstat (limited to 't/lib-httpd.sh')
| -rw-r--r-- | t/lib-httpd.sh | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/t/lib-httpd.sh b/t/lib-httpd.sh index 608949ea80..5d2d56c445 100644 --- a/t/lib-httpd.sh +++ b/t/lib-httpd.sh @@ -99,16 +99,19 @@ then fi HTTPD_VERSION=$($LIB_HTTPD_PATH -v | \ - sed -n 's/^Server version: Apache\/\([0-9]*\)\..*$/\1/p; q') + sed -n 's/^Server version: Apache\/\([0-9.]*\).*$/\1/p; q') +HTTPD_VERSION_MAJOR=$(echo $HTTPD_VERSION | cut -d. -f1) +HTTPD_VERSION_MINOR=$(echo $HTTPD_VERSION | cut -d. -f2) -if test -n "$HTTPD_VERSION" +if test -n "$HTTPD_VERSION_MAJOR" then if test -z "$LIB_HTTPD_MODULE_PATH" then - if ! test $HTTPD_VERSION -ge 2 + if ! test "$HTTPD_VERSION_MAJOR" -eq 2 || + ! test "$HTTPD_VERSION_MINOR" -ge 4 then test_skip_or_die GIT_TEST_HTTPD \ - "at least Apache version 2 is required" + "at least Apache version 2.4 is required" fi if ! test -d "$DEFAULT_HTTPD_MODULE_PATH" then |