From d3b2d07d6eeaf89ec4661feb30a009f9b9b16cbd Mon Sep 17 00:00:00 2001 From: YUNSHEN XIE <1084314248@qq.com> Date: Mon, 9 Nov 2020 20:56:26 +0800 Subject: [PATCH] modified timeout value on windows (#28499) * modified timeout value on windows * fix some error --- cmake/generic.cmake | 8 ++++++-- python/paddle/fluid/tests/unittests/CMakeLists.txt | 7 +++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/cmake/generic.cmake b/cmake/generic.cmake index 6f4ec24851..5a059c183a 100644 --- a/cmake/generic.cmake +++ b/cmake/generic.cmake @@ -385,7 +385,9 @@ function(cc_test_run TARGET_NAME) set_property(TEST ${TARGET_NAME} PROPERTY ENVIRONMENT FLAGS_init_allocated_mem=true) set_property(TEST ${TARGET_NAME} PROPERTY ENVIRONMENT FLAGS_cudnn_deterministic=true) # No unit test should exceed 2 minutes. - if (APPLE OR WIN32) + if (WIN32) + set_tests_properties(${TARGET_NAME} PROPERTIES TIMEOUT 150) + elseif (APPLE) set_tests_properties(${TARGET_NAME} PROPERTIES TIMEOUT 20) else() set_tests_properties(${TARGET_NAME} PROPERTIES TIMEOUT 15) @@ -757,7 +759,9 @@ function(py_test TARGET_NAME) WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) endif() - if (APPLE OR WIN32) + if (WIN32) + set_tests_properties(${TARGET_NAME} PROPERTIES TIMEOUT 150) + elseif (APPLE) set_tests_properties(${TARGET_NAME} PROPERTIES TIMEOUT 20) else() # No unit test should exceed 2 minutes in Linux. diff --git a/python/paddle/fluid/tests/unittests/CMakeLists.txt b/python/paddle/fluid/tests/unittests/CMakeLists.txt index 4191c4c8f4..01c5cfa0aa 100644 --- a/python/paddle/fluid/tests/unittests/CMakeLists.txt +++ b/python/paddle/fluid/tests/unittests/CMakeLists.txt @@ -214,8 +214,11 @@ function(py_test_modules TARGET_NAME) if (py_test_modules_SERIAL) set_property(TEST ${TARGET_NAME} PROPERTY RUN_SERIAL 1) endif() - - set_tests_properties(${TARGET_NAME} PROPERTIES TIMEOUT 15) + if(WIN32) + set_tests_properties(${TARGET_NAME} PROPERTIES TIMEOUT 150) + else() + set_tests_properties(${TARGET_NAME} PROPERTIES TIMEOUT 15) + endif() endif() endfunction() -- GitLab