diff options
| author | Alexander Lobodzinski <alobodzinski@users.noreply.github.com> | 2015-09-07 18:31:18 +0300 |
|---|---|---|
| committer | Alexander Lobodzinski <alobodzinski@users.noreply.github.com> | 2015-09-07 18:31:18 +0300 |
| commit | f7ec431a659acae07bcca0feff73888721fa8055 (patch) | |
| tree | d8a85b9854982fa4554875e82b90473f9a1f779d /include/tests_webservers | |
| parent | e1a87794bce6460113935d35a1053bc5a74808db (diff) | |
/usr/sbin/httpd on OpenBSD is builtin non-Apache webserver, do not run with -v
If Apache is installed it is detected in /usr/local/sbin/httpd nevertheless
Diffstat (limited to 'include/tests_webservers')
| -rw-r--r-- | include/tests_webservers | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/tests_webservers b/include/tests_webservers index bb5db39d..35194eea 100644 --- a/include/tests_webservers +++ b/include/tests_webservers @@ -50,9 +50,13 @@ # Test : HTTP-6622 # Description : Test for Apache installation # Notes : Do not run on NetBSD, -v is unknown option for httpd binary + # On OpenBSD do not run /usr/sbin/httpd with -v: builtin non-Apache if [ ! "${OS}" = "NetBSD" ]; then PREQS_MET="YES"; else PREQS_MET="NO"; fi Register --test-no HTTP-6622 --preqs-met ${PREQS_MET} --weight L --network NO --description "Checking Apache presence" if [ ${SKIPTEST} -eq 0 ]; then + if [ "${OS}" = "OpenBSD" -a "${HTTPDBINARY}" = "/usr/sbin/httpd" ]; then + HTTPDBINARY="" + fi if [ "${HTTPDBINARY}" = "" ]; then Display --indent 2 --text "- Checking Apache" --result "NOT FOUND" --color WHITE else |