diff options
| author | mboelen <michael@cisofy.com> | 2014-11-04 04:08:29 +0300 |
|---|---|---|
| committer | mboelen <michael@cisofy.com> | 2014-11-04 04:08:29 +0300 |
| commit | 6eedbdd17697280a814787f3cfaf7dee95791265 (patch) | |
| tree | fd0388385b0a696578f2304b4da71e44e896ee65 /include/tests_webservers | |
| parent | dcef76d250ceee25b8db588b03a4f1a7b06b487f (diff) | |
Do not run Apache test on OpenBSD and strip control chars [HTTP-6624]
Diffstat (limited to 'include/tests_webservers')
| -rw-r--r-- | include/tests_webservers | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/tests_webservers b/include/tests_webservers index fc23edd3..fe1eca02 100644 --- a/include/tests_webservers +++ b/include/tests_webservers @@ -73,9 +73,9 @@ # # Test : HTTP-6624 # Description : Testing main Apache configuration file - # Notes : Do not run on NetBSD, -V is unknown option for httpd binary + # Notes : Do not run on OpenBSD/NetBSD, as -V is an unknown option for httpd binary if [ ${APACHE_INSTALLED} -eq 1 ]; then - if [ ! "${OS}" = "NetBSD" ]; then + if [ ! "${OS}" = "NetBSD" -a ! "${OS}" = "OpenBSD" ]; then PREQS_MET="YES" else PREQS_MET="NO" @@ -86,10 +86,10 @@ Register --test-no HTTP-6624 --preqs-met ${PREQS_MET} --weight L --network NO --description "Testing main Apache configuration file" if [ ${SKIPTEST} -eq 0 ]; then APACHE_CONFIGFILE="" - APACHE_TEST=`${HTTPDBINARY} -V 2> /dev/null | grep "\-D SERVER_CONFIG_FILE=" | sed 's/[ ]-D SERVER_CONFIG_FILE=//' | tr -d '"' | tr -d ' '` + APACHE_TEST=`${HTTPDBINARY} -V 2> /dev/null | grep "\-D SERVER_CONFIG_FILE=" | sed 's/[ ]-D SERVER_CONFIG_FILE=//' | tr -d '"' | tr -d ' ' | tr -d '[:cntrl:]'` if [ "${APACHE_TEST}" = "" ]; then - Display --indent 6 --text "Result: Can't find the configuration file, so skipping some Apache related tests" + logtext "Result: Can't find the configuration file, so skipping some Apache related tests" else # We found a possible match. Checking if it's valid filename. If not, we need to add a prefix if [ -f ${APACHE_TEST} ]; then |