Commit ef81ce5b authored by Lasse Karstensen's avatar Lasse Karstensen

Wildcard expansion time in make is complicated.

My Makefile-foo isn't developed enough to figure out how to get TESTS
expanded after the initial vtc file generation has happened.

For now hack around it by splitting into two targets, and run the
generating one manually first.
parent b8cab756
......@@ -9,4 +9,5 @@ before_install:
- sudo apt-get install varnish
script:
- make initial
- make check
......@@ -3,16 +3,16 @@ VARNISHD := $(shell which varnishd)
VARNISHTEST := $(shell which varnishtest)
TESTS=tests/*.vtc
check: $(TESTS)
.PHONY: check controlset snippets $(TESTS)
.PHONY: check initial
all: initial check
controlset: controlset.txt tests/vtc-from-controlset.py
initial: controlset.txt tests/vtc-from-controlset.py INSTALL.rst tests/vtc-from-snippets.py
tests/vtc-from-controlset.py controlset.txt > tests/99-controlset.vtc
snippets: INSTALL.rst tests/vtc-from-snippets.py
find tests/ -name snippet-\*vtc -exec rm "{}" \;
cd tests && ./vtc-from-snippets.py ../INSTALL.rst
$(TESTS): controlset snippets
check: $(TESTS)
$(TESTS): devicedetect.vcl initial
${VARNISHTEST} -Dvarnishd=${VARNISHD} -Dprojectdir=$(PWD) $@
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