Fix compile failed without gcc (#3130)

* fix comile failed without gcc

* add sqlite tag for unit test
tokarchuk/v1.17
Lunny Xiao 7 years ago committed by Lauris BH
parent eb6cbedcc0
commit 41d6afe0e7
  1. 5
      Makefile
  2. 1
      models/unit_tests.go
  3. 1
      modules/test/context_tests.go

@ -131,7 +131,8 @@ fmt-check:
.PHONY: test .PHONY: test
test: test:
$(GO) test $(PACKAGES) $(GO) build # test if go build succeed without sqlite support
$(GO) test -tags=sqlite $(PACKAGES)
.PHONY: coverage .PHONY: coverage
coverage: coverage:
@ -142,7 +143,7 @@ coverage:
.PHONY: unit-test-coverage .PHONY: unit-test-coverage
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 .PHONY: test-vendor
test-vendor: test-vendor:

@ -15,7 +15,6 @@ import (
"github.com/Unknwon/com" "github.com/Unknwon/com"
"github.com/go-xorm/core" "github.com/go-xorm/core"
"github.com/go-xorm/xorm" "github.com/go-xorm/xorm"
_ "github.com/mattn/go-sqlite3" // for the test engine
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"gopkg.in/testfixtures.v2" "gopkg.in/testfixtures.v2"
) )

@ -14,7 +14,6 @@ import (
"code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/context"
"github.com/go-macaron/session" "github.com/go-macaron/session"
_ "github.com/mattn/go-sqlite3" // for the test engine
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"gopkg.in/macaron.v1" "gopkg.in/macaron.v1"
) )

Loading…
Cancel
Save