Skip to content

Commit

Permalink
Moves make step to test gui to ci Makefile
Browse files Browse the repository at this point in the history
  • Loading branch information
tdruiva committed Dec 10, 2015
1 parent 2e21cba commit 90fabee
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 11 deletions.
10 changes: 0 additions & 10 deletions Makefile
Expand Up @@ -33,16 +33,6 @@ lint:
test:
go test -cover -v -tags $(GTK_BUILD_TAG) ./...

clean-gui-test:
$(RM) gui-test/*

#TODO: this should only be called on a linux environment
gui-test: clean-gui-test build-gui
ifeq ($(shell uname), Linux)
git clone https://github.com/twstrike/coyim-testing.git gui-test
cd gui-test && COYIM_PATH=$(PWD)/bin/coyim behave --stop
endif

run-cover: clean-cover
go test -coverprofile=xmpp.coverprofile ./xmpp
go test -coverprofile=session.coverprofile ./session
Expand Down
13 changes: 12 additions & 1 deletion ci/Makefile
@@ -1,4 +1,4 @@
ci: get lint check-ui-defs test coveralls
ci: get lint check-ui-defs test coveralls gui-test

get:
make get -C ../
Expand All @@ -19,6 +19,17 @@ coveralls:
go get github.com/mattn/goveralls
goveralls -coverprofile=../gover.coverprofile -service=travis-ci || true


clean-gui-test:
$(RM) -r gui-test

#TODO: this should only be called on a linux environment
gui-test: clean-gui-test ../bin/coyim
ifeq ($(shell uname), Linux)
git clone https://github.com/twstrike/coyim-testing.git gui-test
cd gui-test && COYIM_PATH="../../bin/coyim" behave --stop
endif

clean-release:
$(RM) bin/*

Expand Down

0 comments on commit 90fabee

Please sign in to comment.