[PATCH 23/40] lib-httpd: pass config file to start_httpd()
- From
Christian Couder <christian.couder@gmail.com>
- Date
- Jan 3, 2018, 16:33 UTC
- Message-ID
- <20180103163403.11303-24-chriscool@tuxfamily.org>
- In-Reply-To
- <20180103163403.11303-1-chriscool@tuxfamily.org>
This makes it possible to start an apache web server with different config files.
This will be used in a later patch to pass a config file that makes apache store external objects.
Signed-off-by: Christian Couder <chriscool@tuxfamily.org> --- t/lib-httpd.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/t/lib-httpd.sh b/t/lib-httpd.sh index 435a37465a..2e659a8ee2 100644 --- a/t/lib-httpd.sh +++ b/t/lib-httpd.sh @@ -171,12 +171,14 @@ prepare_httpd() { } start_httpd() { + APACHE_CONF_FILE=${1-apache.conf} + prepare_httpd >&3 2>&4 trap 'code=$?; stop_httpd; (exit $code); die' EXIT "$LIB_HTTPD_PATH" -d "$HTTPD_ROOT_PATH" \ - -f "$TEST_PATH/apache.conf" $HTTPD_PARA \ + -f "$TEST_PATH/$APACHE_CONF_FILE" $HTTPD_PARA \ -c "Listen 127.0.0.1:$LIB_HTTPD_PORT" -k start \ >&3 2>&4 if test $? -ne 0 @@ -191,7 +193,7 @@ stop_httpd() { trap 'die' EXIT "$LIB_HTTPD_PATH" -d "$HTTPD_ROOT_PATH" \ - -f "$TEST_PATH/apache.conf" $HTTPD_PARA -k stop + -f "$TEST_PATH/$APACHE_CONF_FILE" $HTTPD_PARA -k stop } test_http_push_nonff () {
-- 2.16.0.rc0.16.g82191dbc6c.dirty