dani
/
lemonldap-ng
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix test path (#595)

This commit is contained in:
Xavier Guimard 2017-03-02 19:06:50 +00:00
parent fcd76f42a1
commit 5101ad45d6
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -374,9 +374,9 @@ prepare_test_server:
PORT=$(TESTWEBSERVERPORT) \
FASTCGISOCKDIR=`pwd`/e2e-tests/conf \
PORTALDIR=`pwd`/e2e-tests/conf/portal \
PORTALSTATICDIR=`pwd`/$(SRCPORTALDIR)/site/htdocs/static \
PORTALSITEDIR=`pwd`/$(SRCPORTALDIR)/site/htdocs \
MANAGERDIR=`pwd`/e2e-tests/conf/manager \
MANAGERSTATICDIR=`pwd`/$(SRCMANAGERDIR)/site/htdocs/static \
MANAGERSITEDIR=`pwd`/$(SRCMANAGERDIR)/site/htdocs \
TESTDIR=`pwd`/e2e-tests/conf/site \
DEFDOCDIR=`pwd`/doc \
FRDOCDIR=`pwd`/po-doc/fr \
@ -611,8 +611,10 @@ install_webserver_conf:
fi
@$(PERL) -i -pe 's/__DNSDOMAIN__/$(DNSDOMAIN)/g; \
s#__PORTALDIR__#$(PORTALDIR)/#g; \
s#__PORTALSITEDIR__#$(PORTALSITEDIR)/#g; \
s#__PORTALSTATICDIR__#$(PORTALSTATICDIR)/#g; \
s#__MANAGERDIR__#$(MANAGERDIR)/#g; \
s#__MANAGERSITEDIR__#$(MANAGERSITEDIR)/#g; \
s#__MANAGERSTATICDIR__#$(MANAGERSTATICDIR)/#g; \
s#__TESTDIR__#$(TESTDIR)/#g; \
s#__PORT__#$(PORT)#g; \