update

pingcap · Aug 9, 2023 · d0fd181 · d0fd181
1 parent 0ac1bd7
commit d0fd181
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -112,7 +112,9 @@ test_part_br: br_unit_test br_integration_test
 test_part_dumpling: dumpling_unit_test dumpling_integration_test
 
 explaintest: server_check
-	@cd cmd/explaintest && ./run-tests.sh -s ../../bin/tidb-server
+	@mkdir -p $(TEST_COVERAGE_DIR)
+	@cd cmd/explaintest && GOCOVERDIR=../../$(TEST_COVERAGE_DIR) ./run-tests.sh -s ../../bin/tidb-server
+	@$(GO) tool covdata textfmt -i=$(TEST_COVERAGE_DIR) -o=coverage.dat
 
 ddltest:
 	@cd cmd/ddltest && $(GO) test --tags=deadllock,intest -o ../../bin/ddltest -c
@@ -188,9 +190,9 @@ enterprise-server:
 
 server_check:
 ifeq ($(TARGET), "")
-	$(GOBUILD) $(RACE_FLAG) -ldflags '$(CHECK_LDFLAGS)' -o bin/tidb-server ./tidb-server
+	$(GOBUILD) -cover $(RACE_FLAG) -ldflags '$(CHECK_LDFLAGS)' -o bin/tidb-server ./tidb-server
 else
-	$(GOBUILD) $(RACE_FLAG) -ldflags '$(CHECK_LDFLAGS)' -o '$(TARGET)' ./tidb-server
+	$(GOBUILD) -cover $(RACE_FLAG) -ldflags '$(CHECK_LDFLAGS)' -o '$(TARGET)' ./tidb-server
 endif
 
 linux:

diff --git a/cmd/explaintest/run-tests.sh b/cmd/explaintest/run-tests.sh
@@ -310,7 +310,10 @@ if [[ $collation_opt = 0 || $collation_opt = 2 ]]; then
     start_tidb_server
     sleep 5
     run_explain_test
-    kill -9 $SERVER_PID
+    kill -15 $SERVER_PID
+    while ps -p $SERVER_PID > /dev/null; do
+        sleep 1
+    done
     check_data_race
 fi
 
@@ -319,7 +322,10 @@ if [[ $collation_opt = 1 || $collation_opt = 2 ]]; then
     start_tidb_server
     sleep 5
     run_explain_test
-    kill -9 $SERVER_PID
+    kill -15 $SERVER_PID
+    while ps -p $SERVER_PID > /dev/null; do
+        sleep 1
+    done
     check_data_race
 fi