Skip to content

Commit

Permalink
Ignore bench and canary test coverage (cadence-workflow#4297)
Browse files Browse the repository at this point in the history
  • Loading branch information
yux0 authored Jul 6, 2021
1 parent 6964885 commit 7e88e6e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
3 changes: 2 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -417,6 +417,7 @@ INTEG_TEST_XDC_ROOT=./host/xdc
INTEG_TEST_XDC_DIR=hostxdc
INTEG_TEST_NDC_ROOT=./host/ndc
INTEG_TEST_NDC_DIR=hostndc
OPT_OUT_TEST=./bench/% ./canary/%

TEST_TIMEOUT ?= 20m
TEST_ARG ?= -race $(if $(test_v),-v) -timeout $(TEST_TIMEOUT)
Expand All @@ -433,7 +434,7 @@ endif
# all directories with *_test.go files in them (exclude host/xdc)
TEST_DIRS := $(filter-out $(INTEG_TEST_XDC_ROOT)%, $(sort $(dir $(filter %_test.go,$(ALL_SRC)))))
# all tests other than end-to-end integration test fall into the pkg_test category
PKG_TEST_DIRS := $(filter-out $(INTEG_TEST_ROOT)%,$(TEST_DIRS))
PKG_TEST_DIRS := $(filter-out $(INTEG_TEST_ROOT)% $(OPT_OUT_TEST), $(TEST_DIRS))

# Code coverage output files
COVER_ROOT := $(BUILD)/coverage
Expand Down
4 changes: 3 additions & 1 deletion tools/sql/clitest/connTest.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
package clitest

import (
"fmt"
"log"
"net"
"strconv"

Expand Down Expand Up @@ -64,7 +66,7 @@ func (s *SQLConnTestSuite) SetupTest() {
func (s *SQLConnTestSuite) SetupSuite() {
conn, err := newTestConn("", s.pluginName)
if err != nil {
s.Log.Fatal("error creating sql conn, ", tag.Error(err))
log.Fatal(fmt.Sprintf("failed creating sql conn with error: %v", tag.Error(err)))
}
s.SetupSuiteBase(conn)
}
Expand Down

0 comments on commit 7e88e6e

Please sign in to comment.