update Makefiles to remove evrtest

This commit is contained in:
Aaron Meihm 2017-07-19 14:45:17 -05:00
Родитель a9a5c54c62
Коммит 78509186e4
2 изменённых файлов: 3 добавлений и 10 удалений

Просмотреть файл

@ -1,12 +1,9 @@
PROJS = scribe scribecmd evrtest scribevulnpolicy
PROJS = scribe scribecmd scribevulnpolicy
GO = GO15VENDOREXPERIMENT=1 go
GOLINT = golint
all: $(PROJS) runtests
evrtest:
$(GO) install github.com/mozilla/scribe/evrtest
scribe:
$(GO) install github.com/mozilla/scribe
@ -25,7 +22,7 @@ showcoverage: gotests
$(GO) tool cover -html=coverage.out
scribetests: $(PROJS)
cd test && SCRIBECMD=$$(which scribecmd) EVRTESTCMD=$$(which evrtest) $(MAKE) runtests
cd test && SCRIBECMD=$$(which scribecmd) $(MAKE) runtests
lint:
$(GOLINT) $(PROJECT)

Просмотреть файл

@ -1,14 +1,10 @@
TESTDIRS = filecontent filename package concat raw import-chain hasline tags \
evrtest
TESTDIRS = filecontent filename package concat raw import-chain hasline tags
all:
runtests:
ifndef SCRIBECMD
$(error SCRIBECMD is undefined, tests must be ran from the root of the repository)
endif
ifndef EVRTESTCMD
$(error EVRTESTCMD is undefined, tests must be ran from the root of the repository)
endif
for x in $(TESTDIRS); do \
$(MAKE) -C $$x runtests || exit 1; \