Skip to content

Commit f597db7

Browse files
authored
Merge pull request #1923 from reyoung/skip_test_when_not_compoile_py_paddle
Disable some unit tests when PYTHON or SWIG_PY are not enabled.
2 parents fedc850 + d246d20 commit f597db7

File tree

2 files changed

+17
-11
lines changed

2 files changed

+17
-11
lines changed

paddle/trainer/tests/CMakeLists.txt

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,17 @@ add_test(NAME test_Trainer
1717
WORKING_DIRECTORY ${PROJ_ROOT}/paddle/)
1818

1919
############### test_TrainerOnePass ##########################
20-
add_unittest_without_exec(test_TrainerOnePass
21-
test_TrainerOnePass.cpp)
22-
add_test(NAME test_TrainerOnePass
23-
COMMAND ${PROJ_ROOT}/paddle/.set_python_path.sh -d
24-
${PROJ_ROOT}/python/:${PROJ_ROOT}/paddle/trainer/tests
25-
${PROJ_ROOT}/paddle/.set_port.sh -p port ${CMAKE_CURRENT_BINARY_DIR}/test_TrainerOnePass
26-
WORKING_DIRECTORY ${PROJ_ROOT}/paddle/)
27-
20+
if(WITH_PYTHON)
21+
# only run test_TrainerOnePass when PYTHON is enabled, because train one pass
22+
# is using PyDataProvider2.
23+
add_unittest_without_exec(test_TrainerOnePass
24+
test_TrainerOnePass.cpp)
25+
add_test(NAME test_TrainerOnePass
26+
COMMAND ${PROJ_ROOT}/paddle/.set_python_path.sh -d
27+
${PROJ_ROOT}/python/:${PROJ_ROOT}/paddle/trainer/tests
28+
${PROJ_ROOT}/paddle/.set_port.sh -p port ${CMAKE_CURRENT_BINARY_DIR}/test_TrainerOnePass
29+
WORKING_DIRECTORY ${PROJ_ROOT}/paddle/)
30+
endif()
2831
################ test_CompareTwoNets ######################
2932
add_unittest_without_exec(test_CompareTwoNets
3033
test_CompareTwoNets.cpp)

python/CMakeLists.txt

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,12 @@ add_custom_target(paddle_python ALL DEPENDS
2424
${OUTPUT_DIR}/.timestamp)
2525

2626
add_subdirectory(paddle/trainer_config_helpers/tests)
27-
add_subdirectory(paddle/v2/tests)
28-
add_subdirectory(paddle/v2/reader/tests)
29-
add_subdirectory(paddle/v2/plot/tests)
27+
if (WITH_SWIG_PY)
28+
# enable v2 API unittest only when paddle swig api is compiled
29+
add_subdirectory(paddle/v2/tests)
30+
add_subdirectory(paddle/v2/reader/tests)
31+
add_subdirectory(paddle/v2/plot/tests)
32+
endif()
3033

3134
install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/dist/
3235
DESTINATION opt/paddle/share/wheels

0 commit comments

Comments
 (0)