Merge branch 'release-2.1' into automated-cherry-pick-of-pingcap#11176-…

…upstream-release-2.1
SunRunAway · Jul 23, 2019 · b9f9d13 · b9f9d13
2 parents df81119 + b978528
commit b9f9d13
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/expression/evaluator_test.go b/expression/evaluator_test.go
@@ -31,7 +31,7 @@ import (
 	"github.com/pingcap/tidb/util/testutil"
 )
 
-var _ = Suite(&testEvaluatorSuite{})
+var _ = SerialSuites(&testEvaluatorSuite{})
 
 func TestT(t *testing.T) {
 	CustomVerboseFlag = true