Textual improvement on screen for Apache configuration test

This commit is contained in:
mboelen 2014-10-14 10:40:00 +02:00
parent d6dbbeedb5
commit bd5c9ddd7b
1 changed files with 2 additions and 2 deletions

View File

@ -86,7 +86,7 @@
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 | 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 ' '`
if [ "${APACHE_TEST}" = "" ]; then
Display --indent 6 --text "Result: Can't find the configuration file, so skipping some Apache related tests"
@ -106,7 +106,7 @@
Display --indent 6 --text "Info: Configuration file found (${APACHE_CONFIGFILE})"
logtext "Result: Configuration file found (${APACHE_CONFIGFILE})"
else
logtext "Exception: File or directory ${APACHE_CONFIGFILE} does not exist"
logtext "Result: File or directory ${APACHE_CONFIGFILE} does not exist"
Display --indent 6 --text "[Notice] possible directory/file parts found, but still unsure what the real configuration file is. Skipping some Apache related tests"
ReportException "${TEST_NO}:1" "Found some unknown directory or file references in Apache configuration"
fi