diff --git a/Makefile b/Makefile index c6b484a60..dfa193417 100644 --- a/Makefile +++ b/Makefile @@ -43,9 +43,6 @@ test: deps @./scripts/test.sh @$(MAKE) vet -integ: - go list ./... | INTEG_TESTS=yes xargs -n1 go test - cover: deps ./scripts/verify_no_uuid.sh go list ./... | xargs -n1 go test --cover @@ -76,4 +73,4 @@ web: web-push: ./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 diff --git a/make.bat b/make.bat index 659560e73..a1360b025 100644 --- a/make.bat +++ b/make.bat @@ -23,10 +23,10 @@ if x%1==xdeps goto end goto 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 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 goto end @@ -45,10 +45,6 @@ go tool cover 2>NUL if %ERRORLEVEL% EQU 3 go get golang.org/x/tools/cmd/cover goto test -:integ -set INTEG_TESTS=yes -goto test - :test call .\scripts\windows\verify_no_uuid.bat %CD% if %ERRORLEVEL% EQU 0 goto _test