experiments/clixon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

test / restconf /vagrant fixes

Browse source
This commit is contained in:
Olof hagsand 2020-11-21 16:10:38 +01:00
parent 87d9b7776e
commit ae8e287dd9
4 changed files with 22 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

8
test/vagrant/Makefile.in
View file

@ -45,9 +45,11 @@ SHELL = /bin/sh
# The "site.mk" file if it exists and define the VAGRANTS variables
# eg:
# VAGRANTS += freebsd/FreeBSD-12.1-STABLE
VAGRANTS =
# evhtp or fcgi
RESTCONF=evhtp
-include site.mk
.PHONY: all clean distclean depend install uninstall $(VAGRANTS) destroy
@ -61,9 +63,9 @@ logs:
# appear eg as generic/centos8.log
$(VAGRANTS): logs
ifdef LOGDIR
./vagrant.sh $@ 2>&1 > "$(LOGDIR)/$(subst /,-,$@).log"
with_restconf=$(RESTCONF) ./vagrant.sh $@ 2>&1 > "$(LOGDIR)/$(subst /,-,$@).$(RESTCONF).log"
else
./vagrant.sh $@ 2>&1 | tee "logs/$(subst /,-,$@).log"
with_restconf=$(RESTCONF) ./vagrant.sh $@ 2>&1 | tee "logs/$(subst /,-,$@).$(RESTCONF).log"
endif
destroy: