Commit 7caa33ba authored by Yadd's avatar Yadd
Browse files

New target: reload_web_server

parent 58940f17
......@@ -239,6 +239,13 @@ start_web_server: prepare_test_server
# Start web server (designed for Debian, path may be broken else)
@LLNG_DEFAULTCONFFILE=`pwd`/e2e-tests/conf/lemonldap-ng.ini /usr/sbin/apache2 -d `pwd`/e2e-tests -f apache2.conf -k start
@if [ -e e2e-tests/conf/ ]; then \
LLNG_DEFAULTCONFFILE=`pwd`/e2e-tests/conf/lemonldap-ng.ini /usr/sbin/apache2 -d `pwd`/e2e-tests -f apache2.conf -k graceful; \
else \
$(MAKE) start_web_server; \
# Start e2e tests
# NB: you must have protractor installed (using npm install -g protractor)
......@@ -247,7 +254,7 @@ launch_protractor:
# Stop web server
@kill `cat e2e-tests/conf/`
-@kill `cat e2e-tests/conf/`
# Clean
@rm -rf e2e-tests/conf
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment