From 41d6afe0e7992567ac7c86cdd41b9226aae896d2 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Sun, 10 Dec 2017 22:08:19 +0800 Subject: [PATCH] Fix compile failed without gcc (#3130) * fix comile failed without gcc * add sqlite tag for unit test --- Makefile | 5 +++-- models/unit_tests.go | 1 - modules/test/context_tests.go | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 501defcd9..ebafa95c2 100644 --- a/Makefile +++ b/Makefile @@ -131,7 +131,8 @@ fmt-check: .PHONY: test test: - $(GO) test $(PACKAGES) + $(GO) build # test if go build succeed without sqlite support + $(GO) test -tags=sqlite $(PACKAGES) .PHONY: coverage coverage: @@ -142,7 +143,7 @@ coverage: .PHONY: unit-test-coverage unit-test-coverage: - for PKG in $(PACKAGES); do $(GO) test -cover -coverprofile $$GOPATH/src/$$PKG/coverage.out $$PKG || exit 1; done; + for PKG in $(PACKAGES); do $(GO) test -tags=sqlite -cover -coverprofile $$GOPATH/src/$$PKG/coverage.out $$PKG || exit 1; done; .PHONY: test-vendor test-vendor: diff --git a/models/unit_tests.go b/models/unit_tests.go index cf7c3e4f9..ff7a87da3 100644 --- a/models/unit_tests.go +++ b/models/unit_tests.go @@ -15,7 +15,6 @@ import ( "github.com/Unknwon/com" "github.com/go-xorm/core" "github.com/go-xorm/xorm" - _ "github.com/mattn/go-sqlite3" // for the test engine "github.com/stretchr/testify/assert" "gopkg.in/testfixtures.v2" ) diff --git a/modules/test/context_tests.go b/modules/test/context_tests.go index aa109aa0d..11f3d83b8 100644 --- a/modules/test/context_tests.go +++ b/modules/test/context_tests.go @@ -14,7 +14,6 @@ import ( "code.gitea.io/gitea/modules/context" "github.com/go-macaron/session" - _ "github.com/mattn/go-sqlite3" // for the test engine "github.com/stretchr/testify/assert" "gopkg.in/macaron.v1" )