luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Removes the integration test runner, there weren't any tests using it.

This commit is contained in:
James Phillips 2015-10-26 11:32:58 -07:00
parent bc79b65f3f
commit d5e200874b
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -43,9 +43,6 @@ test: deps
@./scripts/test.sh @./scripts/test.sh
@$(MAKE) vet @$(MAKE) vet
integ:
go list ./... | INTEG_TESTS=yes xargs -n1 go test
cover: deps cover: deps
./scripts/verify_no_uuid.sh ./scripts/verify_no_uuid.sh
go list ./... | xargs -n1 go test --cover go list ./... | xargs -n1 go test --cover
@ -76,4 +73,4 @@ web:
web-push: web-push:
./scripts/website_push.sh ./scripts/website_push.sh
.PHONY: all bin dev dist cov deps integ test vet web web-push generate test-nodep .PHONY: all bin dev dist cov deps test vet web web-push generate test-nodep

8
make.bat
View File

@ -23,10 +23,10 @@ if x%1==xdeps goto end
goto args goto args
:args :args
for %%a in (all,cover,integ,test,vet,updatedeps) do (if x%1==x%%a goto %%a) for %%a in (all,cover,test,vet,updatedeps) do (if x%1==x%%a goto %%a)
echo. echo.
echo Unknown make target: %1 echo Unknown make target: %1
echo Expected one of "all", "cover", "deps", "integ", "test", "vet", or "updatedeps". echo Expected one of "all", "cover", "deps", "test", "vet", or "updatedeps".
set _EXITCODE=1 set _EXITCODE=1
goto end goto end
@ -45,10 +45,6 @@ go tool cover 2>NUL
if %ERRORLEVEL% EQU 3 go get golang.org/x/tools/cmd/cover if %ERRORLEVEL% EQU 3 go get golang.org/x/tools/cmd/cover
goto test goto test
:integ
set INTEG_TESTS=yes
goto test
:test :test
call .\scripts\windows\verify_no_uuid.bat %CD% call .\scripts\windows\verify_no_uuid.bat %CD%
if %ERRORLEVEL% EQU 0 goto _test if %ERRORLEVEL% EQU 0 goto _test