Skip to content

Commit

Permalink
Removes the integration test runner, there weren't any tests using it.
Browse files Browse the repository at this point in the history
  • Loading branch information
James Phillips committed Oct 26, 2015
1 parent 2aca5a9 commit 89340fe
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 10 deletions.
5 changes: 1 addition & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
8 changes: 2 additions & 6 deletions make.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Expand Down

0 comments on commit 89340fe

Please sign in to comment.