Starman target for tests
This commit is contained in:
parent
3f50519c7b
commit
0333eaa7cc
26
Makefile
26
Makefile
|
@ -475,11 +475,29 @@ start_web_server: all prepare_test_server
|
||||||
2>&1 | grep -v 'Permission denied' || true; \
|
2>&1 | grep -v 'Permission denied' || true; \
|
||||||
echo "Launching plackup"; \
|
echo "Launching plackup"; \
|
||||||
$(MAKE) plackup; \
|
$(MAKE) plackup; \
|
||||||
|
elif test "$(TESTWEBSERVER)" = "starman"; then \
|
||||||
|
if test "$(TESTUSESSL)" = "1"; then \
|
||||||
|
ARGS="--ssl-cert-file e2e-tests/cert.pem --ssl-key-file e2e-tests/key.pem --enable-ssl"; \
|
||||||
|
else \
|
||||||
|
ARGS=; \
|
||||||
|
fi; \
|
||||||
|
echo "ARGS=$$ARGS"; \
|
||||||
|
LLNG_DEFAULTCONFFILE=`pwd`/e2e-tests/conf/lemonldap-ng.ini \
|
||||||
|
PERL5LIB=`pwd`/lemonldap-ng-common/blib/lib/:`pwd`/lemonldap-ng-handler/blib/lib/:`pwd`/lemonldap-ng-portal/blib/lib/:`pwd`/lemonldap-ng-manager/blib/lib/ \
|
||||||
|
/usr/bin/start_server \
|
||||||
|
--log-file=e2e-tests/conf/starman.log \
|
||||||
|
--pid-file=e2e-tests/conf/server.pid \
|
||||||
|
--status-file=e2e-tests/conf/server-status.pid \
|
||||||
|
--daemonize \
|
||||||
|
-- starman \
|
||||||
|
--port=$(TESTWEBSERVERPORT) \
|
||||||
|
--workers 3 \
|
||||||
|
$$ARGS \
|
||||||
|
e2e-tests/llng.psgi; \
|
||||||
else \
|
else \
|
||||||
echo "!!!!! Unknown test server: $(TESTWEBSERVER) !!!!!" >&2; \
|
echo "!!!!! Unknown test server: $(TESTWEBSERVER) !!!!!" >&2; \
|
||||||
exit 1; \
|
exit 1; \
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
reload_web_server:
|
reload_web_server:
|
||||||
@if [ -e e2e-tests/conf/apache2.pid ]; then \
|
@if [ -e e2e-tests/conf/apache2.pid ]; then \
|
||||||
|
@ -489,6 +507,11 @@ reload_web_server:
|
||||||
kill -HUP `cat e2e-tests/conf/nginx.pid`; \
|
kill -HUP `cat e2e-tests/conf/nginx.pid`; \
|
||||||
kill `cat e2e-tests/conf/llng-fastcgi.pid` || true; \
|
kill `cat e2e-tests/conf/llng-fastcgi.pid` || true; \
|
||||||
$(MAKE) plackup; \
|
$(MAKE) plackup; \
|
||||||
|
elif [ -e e2e-tests/conf/server.pid ]; then \
|
||||||
|
/usr/bin/start_server\
|
||||||
|
--pid-file=e2e-tests/conf/server.pid \
|
||||||
|
--status-file=e2e-tests/conf/server-status.pid \
|
||||||
|
--restart; \
|
||||||
else \
|
else \
|
||||||
$(MAKE) start_web_server; \
|
$(MAKE) start_web_server; \
|
||||||
fi
|
fi
|
||||||
|
@ -505,6 +528,7 @@ stop_web_server:
|
||||||
-@[ -e e2e-tests/conf/nginx.pid ] && kill `cat e2e-tests/conf/nginx.pid` ||true
|
-@[ -e e2e-tests/conf/nginx.pid ] && kill `cat e2e-tests/conf/nginx.pid` ||true
|
||||||
-@[ -e e2e-tests/conf/llng-fastcgi.pid ] && kill `cat e2e-tests/conf/llng-fastcgi.pid` && rm -f e2e-tests/conf/llng-fastcgi.pid || true
|
-@[ -e e2e-tests/conf/llng-fastcgi.pid ] && kill `cat e2e-tests/conf/llng-fastcgi.pid` && rm -f e2e-tests/conf/llng-fastcgi.pid || true
|
||||||
-@[ -e e2e-tests/conf/slapd.pid ] && kill `cat e2e-tests/conf/slapd.pid` || true
|
-@[ -e e2e-tests/conf/slapd.pid ] && kill `cat e2e-tests/conf/slapd.pid` || true
|
||||||
|
-@[ -e e2e-tests/conf/server.pid ] && kill `cat e2e-tests/conf/server.pid` || true
|
||||||
# Clean
|
# Clean
|
||||||
@rm -rf e2e-tests/conf
|
@rm -rf e2e-tests/conf
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user