database/tidb
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*: run tests in the package name with "test" when doing make test (#13301)

Browse Source
This commit is contained in:
Lynn
2019-11-13 13:09:06 +08:00
committed by pingcap-github-bot
parent 343bb640a0
commit 4efb32b01a
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -20,7 +20,7 @@ OVERALLS := GO111MODULE=on overalls
ARCH := "`uname -s`"
LINUX := "Linux"
MAC := "Darwin"
PACKAGE_LIST := go list ./...| grep -vE "cmd" | grep -vE "test"
PACKAGE_LIST := go list ./...| grep -vE "cmd"
PACKAGES := $$($(PACKAGE_LIST))
PACKAGE_DIRECTORIES := $(PACKAGE_LIST) | sed 's|github.com/pingcap/$(PROJECT)/||'
FILES := $$(find $$($(PACKAGE_DIRECTORIES)) -name "*.go")

12
util/testutil/testutil.go
View File

@ -178,7 +178,11 @@ func loadTestSuiteCases(filePath string) (res []testCases, err error) {
if err != nil {
return res, err
}
defer jsonFile.Close()
defer func() {
if err1 := jsonFile.Close(); err == nil && err1 != nil {
err = err1
}
}()
byteValue, err := ioutil.ReadAll(jsonFile)
if err != nil {
return res, err
@ -283,7 +287,11 @@ func (t *TestData) GenerateOutputIfNeeded() error {
if err != nil {
return err
}
defer file.Close()
defer func() {
if err1 := file.Close(); err == nil && err1 != nil {
err = err1
}
}()
_, err = file.Write(buf.Bytes())
return err
}