From 0271eb00b85ddaacb1e28799561a85f3a14a99b3 Mon Sep 17 00:00:00 2001
From: qili93 <qili93@qq.com>
Date: Mon, 30 Aug 2021 12:25:25 +0800
Subject: [PATCH] [NPU] fix cmake for ascend ci, test=develop

---
 paddle/scripts/paddle_build.sh                |  2 +-
 .../fluid/tests/unittests/CMakeLists.txt      | 39 ++++++++++++-------
 2 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/paddle/scripts/paddle_build.sh b/paddle/scripts/paddle_build.sh
index 58be5862dc5..94272ae2f89 100755
--- a/paddle/scripts/paddle_build.sh
+++ b/paddle/scripts/paddle_build.sh
@@ -1711,7 +1711,7 @@ function parallel_test_base_npu() {
     ========================================
 EOF
 
-set +x
+set -x
         test_cases=$(ctest -N -V) # get all test cases
         get_quickly_disable_ut||disable_ut_quickly=''   # indicate whether the case was in quickly disable list
         while read -r line; do
diff --git a/python/paddle/fluid/tests/unittests/CMakeLists.txt b/python/paddle/fluid/tests/unittests/CMakeLists.txt
index 250e8159b8c..fb7f18fcc4e 100644
--- a/python/paddle/fluid/tests/unittests/CMakeLists.txt
+++ b/python/paddle/fluid/tests/unittests/CMakeLists.txt
@@ -279,22 +279,31 @@ function(py_test_modules TARGET_NAME)
     cmake_parse_arguments(py_test_modules "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
 
     if(WITH_COVERAGE AND NOT (WITH_INCREMENTAL_COVERAGE AND "$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}
-                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})
-    elseif(WITH_ASCEND_CL)
-        # AscendCL need to include ascend toolkit python path, or ACL error will be thrown when running ctest
-        add_test(NAME ${TARGET_NAME}
-                COMMAND ${CMAKE_COMMAND} -E env PYTHONPATH=${PADDLE_BINARY_DIR}/python:$ENV{PYTHONPATH} ${py_test_modules_ENVS}
-                ${PYTHON_EXECUTABLE} ${PADDLE_SOURCE_DIR}/tools/test_runner.py ${py_test_modules_MODULES}
-                WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+        if(WITH_ASCEND_CL)
+            add_test(NAME ${TARGET_NAME}
+                    COMMAND ${CMAKE_COMMAND} -E env PYTHONPATH=${PADDLE_BINARY_DIR}/python:$ENV{PYTHONPATH} ${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}
+                    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})
+        endif()
     else()
-        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})
+        if(WITH_ASCEND_CL)
+            add_test(NAME ${TARGET_NAME}
+                    COMMAND ${CMAKE_COMMAND} -E env PYTHONPATH=${PADDLE_BINARY_DIR}/python:$ENV{PYTHONPATH} ${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}
+                    ${PYTHON_EXECUTABLE} ${PADDLE_SOURCE_DIR}/tools/test_runner.py ${py_test_modules_MODULES}
+                    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+        endif()
     endif()
 
     if (py_test_modules_SERIAL)
-- 
GitLab