From 2b2cd1864a33d66e9c7dca963797f0e117371144 Mon Sep 17 00:00:00 2001
From: wanghuancoder <wanghuan29@baidu.com>
Date: Tue, 1 Dec 2020 10:19:50 +0800
Subject: [PATCH] revert python file coverage, delete coverage run --include,
 test=develop (#29230)

---
 cmake/generic.cmake                           | 24 ++++++-------------
 .../fluid/tests/unittests/CMakeLists.txt      | 17 ++++---------
 2 files changed, 12 insertions(+), 29 deletions(-)

diff --git a/cmake/generic.cmake b/cmake/generic.cmake
index 835ea5f61c..d3fca7c66f 100644
--- a/cmake/generic.cmake
+++ b/cmake/generic.cmake
@@ -790,23 +790,13 @@ function(py_test TARGET_NAME)
     cmake_parse_arguments(py_test "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
 
     if(WITH_COVERAGE)
-      if ("$ENV{PADDLE_GIT_DIFF_PY_FILE}" STREQUAL "")
-        add_test(NAME ${TARGET_NAME}
-                COMMAND ${CMAKE_COMMAND} -E env FLAGS_init_allocated_mem=true FLAGS_cudnn_deterministic=true
-                FLAGS_cpu_deterministic=true
-                PYTHONPATH=${PADDLE_BINARY_DIR}/python ${py_test_ENVS}
-                ${PYTHON_EXECUTABLE} -u ${py_test_SRCS} ${py_test_ARGS}
-                WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
-
-      else()
-        add_test(NAME ${TARGET_NAME}
-                COMMAND ${CMAKE_COMMAND} -E env FLAGS_init_allocated_mem=true FLAGS_cudnn_deterministic=true
-                FLAGS_cpu_deterministic=true
-                PYTHONPATH=${PADDLE_BINARY_DIR}/python ${py_test_ENVS}
-                COVERAGE_FILE=${PADDLE_BINARY_DIR}/python-coverage.data
-                ${PYTHON_EXECUTABLE} -m coverage run --branch -p --include=$ENV{PADDLE_GIT_DIFF_PY_FILE} ${py_test_SRCS} ${py_test_ARGS}
-                WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
-      endif()
+      add_test(NAME ${TARGET_NAME}
+        COMMAND ${CMAKE_COMMAND} -E env FLAGS_init_allocated_mem=true FLAGS_cudnn_deterministic=true
+        FLAGS_cpu_deterministic=true
+        PYTHONPATH=${PADDLE_BINARY_DIR}/python ${py_test_ENVS}
+        COVERAGE_FILE=${PADDLE_BINARY_DIR}/python-coverage.data
+        ${PYTHON_EXECUTABLE} -m coverage run --branch -p ${py_test_SRCS} ${py_test_ARGS}
+        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
     else()
       add_test(NAME ${TARGET_NAME}
                COMMAND ${CMAKE_COMMAND} -E env FLAGS_init_allocated_mem=true FLAGS_cudnn_deterministic=true
diff --git a/python/paddle/fluid/tests/unittests/CMakeLists.txt b/python/paddle/fluid/tests/unittests/CMakeLists.txt
index 1f5c591efc..150fa4c1d1 100644
--- a/python/paddle/fluid/tests/unittests/CMakeLists.txt
+++ b/python/paddle/fluid/tests/unittests/CMakeLists.txt
@@ -235,18 +235,11 @@ function(py_test_modules TARGET_NAME)
     cmake_parse_arguments(py_test_modules "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
 
     if(WITH_COVERAGE)
-        if ("$ENV{PADDLE_GIT_DIFF_PY_FILE}" STREQUAL "")
-            add_test(NAME ${TARGET_NAME}
-                    COMMAND ${CMAKE_COMMAND} -E env PYTHONPATH=${PADDLE_BINARY_DIR}/python ${py_test_modules_ENVS}
-                    ${PYTHON_EXECUTABLE} ${PADDLE_SOURCE_DIR}/tools/test_runner.py ${py_test_modules_MODULES}
-                    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
-        else()
-            add_test(NAME ${TARGET_NAME}
-                    COMMAND ${CMAKE_COMMAND} -E env PYTHONPATH=${PADDLE_BINARY_DIR}/python ${py_test_modules_ENVS}
-                    COVERAGE_FILE=${PADDLE_BINARY_DIR}/python-coverage.data
-                    ${PYTHON_EXECUTABLE} -m coverage run --branch -p --include=$ENV{PADDLE_GIT_DIFF_PY_FILE} ${PADDLE_SOURCE_DIR}/tools/test_runner.py ${py_test_modules_MODULES}
-                    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
-        endif()
+        add_test(NAME ${TARGET_NAME}
+            COMMAND ${CMAKE_COMMAND} -E env PYTHONPATH=${PADDLE_BINARY_DIR}/python ${py_test_modules_ENVS}
+            COVERAGE_FILE=${PADDLE_BINARY_DIR}/python-coverage.data
+            ${PYTHON_EXECUTABLE} -m coverage run --branch -p ${PADDLE_SOURCE_DIR}/tools/test_runner.py ${py_test_modules_MODULES}
+            WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
     else()
         add_test(NAME ${TARGET_NAME}
                 COMMAND ${CMAKE_COMMAND} -E env PYTHONPATH=${PADDLE_BINARY_DIR}/python ${py_test_modules_ENVS}
-- 
GitLab