Commit 2ef5f950 authored by Xavier Guimard's avatar Xavier Guimard

More comments

git-svn-id: svn://svn.forge.objectweb.org/svnroot/lemonldap/trunk@4018 1dbb9719-a921-0410-b57f-c3a383c2c641
parent 5519f465
......@@ -247,7 +247,7 @@ e2e_test: all prepare_test_server start_web_server launch_protractor stop_web_se
prepare_test_server:
@mkdir -p e2e-tests/conf/lock
$(MAKE) install_webserver_conf \
@$(MAKE) install_webserver_conf \
RCONFDIR=e2e-tests/conf \
ERASECONFIG=1 \
VHOSTLISTEN='*:$(WEBSERVERPORT)' \
......@@ -256,13 +256,13 @@ prepare_test_server:
MANAGERPSGIDIR=`pwd`/e2e-tests \
DEFDOCDIR=`pwd`/doc \
FRDOCDIR=`pwd`/po-doc/fr
cp e2e-tests/lmConf-1.js e2e-tests/lemonldap-ng.ini e2e-tests/env.conf e2e-tests/conf/
perl -i -pe 'BEGIN{$$p=`pwd`;chomp $$p}s#__pwd__#$$p#;s/__port__/$(WEBSERVERPORT)/' e2e-tests/conf/lemonldap-ng.ini e2e-tests/conf/lmConf-1.js e2e-tests/conf/env.conf
@cp e2e-tests/lmConf-1.js e2e-tests/lemonldap-ng.ini e2e-tests/env.conf e2e-tests/conf/
@perl -i -pe 'BEGIN{$$p=`pwd`;chomp $$p}s#__pwd__#$$p#;s/__port__/$(WEBSERVERPORT)/' e2e-tests/conf/lemonldap-ng.ini e2e-tests/conf/lmConf-1.js e2e-tests/conf/env.conf
e2e-tests/conf/apache2.pid: start_web_server
start_web_server: all prepare_test_server
# Clean old server
# Clean old server if launched
-@[ -e e2e-tests/conf/apache2.pid ] && kill `cat e2e-tests/conf/apache2.pid` && sleep 1
# 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
......@@ -277,7 +277,7 @@ reload_web_server:
launch_protractor: all e2e-tests/conf/apache2.pid
# Start e2e tests
# NB: you must have protractor installed (using npm install -g protractor)
# and have run update-webdriver at least once
# and have run update-webdriver at least once and have a node.js > 4.0
@WEBSERVERPORT=$(WEBSERVERPORT) protractor e2e-tests/protractor-conf.js
stop_web_server:
......
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