diff options
| author | Michael Boelen <michael@cisofy.com> | 2015-09-07 21:58:55 +0300 |
|---|---|---|
| committer | Michael Boelen <michael@cisofy.com> | 2015-09-07 21:58:55 +0300 |
| commit | 48fd39c57032fa15b87281693b62725caef80481 (patch) | |
| tree | e3cf7e1a1a01022ef8e3c8ad9a2c1b1c7b85f7ea /include/tests_webservers | |
| parent | e50eef0c1998524583c47a6cf28a89cb683cff78 (diff) | |
| parent | f7ec431a659acae07bcca0feff73888721fa8055 (diff) | |
Merge pull request #71 from alobodzinski/openbsd-httpd
merging pull request to skip httpd on OpenBSD systems.
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 51a8d528..8c457f0d 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 |