kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'tc/test-locate-httpd' 

* tc/test-locate-httpd:
  t/lib-http.sh: Restructure finding of default httpd location
maint
Junio C Hamano 2010-01-17 16:00:13 -08:00
parent f8eb50f60b 0d344738dc
commit f287c65b26
1 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
t/lib-httpd.sh
View File

@ -12,16 +12,29 @@ fi


HTTPD_PARA="" HTTPD_PARA=""


for DEFAULT_HTTPD_PATH in '/usr/sbin/httpd' '/usr/sbin/apache2'
do
if test -x "$DEFAULT_HTTPD_PATH"
then
break
fi
done

for DEFAULT_HTTPD_MODULE_PATH in '/usr/libexec/apache2' \
'/usr/lib/apache2/modules' \
'/usr/lib64/httpd/modules' \
'/usr/lib/httpd/modules'
do
if test -d "$DEFAULT_HTTPD_MODULE_PATH"
then
break
fi
done

case $(uname) in case $(uname) in
Darwin) Darwin)
DEFAULT_HTTPD_PATH='/usr/sbin/httpd'
DEFAULT_HTTPD_MODULE_PATH='/usr/libexec/apache2'
HTTPD_PARA="$HTTPD_PARA -DDarwin" HTTPD_PARA="$HTTPD_PARA -DDarwin"
;; ;;
*)
DEFAULT_HTTPD_PATH='/usr/sbin/apache2'
DEFAULT_HTTPD_MODULE_PATH='/usr/lib/apache2/modules'
;;
esac esac


LIB_HTTPD_PATH=${LIB_HTTPD_PATH-"$DEFAULT_HTTPD_PATH"} LIB_HTTPD_PATH=${LIB_HTTPD_PATH-"$DEFAULT_HTTPD_PATH"}
@ -49,6 +62,11 @@ then
say "skipping test, at least Apache version 2 is required" say "skipping test, at least Apache version 2 is required"
test_done test_done
fi fi
if ! test -d "$DEFAULT_HTTPD_MODULE_PATH"
then
say "Apache module directory not found. Skipping tests."
test_done
fi


LIB_HTTPD_MODULE_PATH="$DEFAULT_HTTPD_MODULE_PATH" LIB_HTTPD_MODULE_PATH="$DEFAULT_HTTPD_MODULE_PATH"
fi fi