diff options
| author | dimdim11 <[email protected]> | 2024-01-25 22:40:09 +0300 |
|---|---|---|
| committer | dimdim11 <[email protected]> | 2024-01-25 23:23:31 +0300 |
| commit | a87a6225bc70a7ec058857e1a5dc6c423610d249 (patch) | |
| tree | fb59568abb7e07e721ba89f2fe38ce461add3849 | |
| parent | 970ad064d8e3150bb9ecef2927db8c9b76291286 (diff) | |
Fill ENVIRONMENT for CMake projects from ENV() macroses
| -rw-r--r-- | build/export_generators/hardcoded-cmake/cmake/common.cmake | 4 | ||||
| -rw-r--r-- | build/export_generators/hardcoded-cmake/generator.toml | 2 | ||||
| -rw-r--r-- | build/ymake.core.conf | 2 | ||||
| -rw-r--r-- | cmake/common.cmake | 4 |
4 files changed, 7 insertions, 5 deletions
diff --git a/build/export_generators/hardcoded-cmake/cmake/common.cmake b/build/export_generators/hardcoded-cmake/cmake/common.cmake index 0ffe61ad175..f85875ec405 100644 --- a/build/export_generators/hardcoded-cmake/cmake/common.cmake +++ b/build/export_generators/hardcoded-cmake/cmake/common.cmake @@ -296,13 +296,13 @@ function(set_yunittest_property) get_property(SPLIT_FACTOR TARGET ${YUNITTEST_ARGS_TEST} PROPERTY SPLIT_FACTOR) if ((${SPLIT_FACTOR} EQUAL 1) OR (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/run_testpack")) - set_property(TEST ${YUNITTEST_ARGS_TEST} PROPERTY ${YUNITTEST_ARGS_PROPERTY} ${YUNITTEST_ARGS_UNPARSED_ARGUMENTS}) + set_property(TEST ${YUNITTEST_ARGS_TEST} PROPERTY ${YUNITTEST_ARGS_PROPERTY} "${YUNITTEST_ARGS_UNPARSED_ARGUMENTS}") return() endif() math(EXPR LastIdx "${SPLIT_FACTOR} - 1") foreach(Idx RANGE ${LastIdx}) - set_property(TEST ${YUNITTEST_ARGS_TEST}_${Idx} PROPERTY ${YUNITTEST_ARGS_PROPERTY} ${YUNITTEST_ARGS_UNPARSED_ARGUMENTS}) + set_property(TEST ${YUNITTEST_ARGS_TEST}_${Idx} PROPERTY ${YUNITTEST_ARGS_PROPERTY} "${YUNITTEST_ARGS_UNPARSED_ARGUMENTS}") endforeach() endfunction() diff --git a/build/export_generators/hardcoded-cmake/generator.toml b/build/export_generators/hardcoded-cmake/generator.toml index 648d69108a8..8d1fe96420a 100644 --- a/build/export_generators/hardcoded-cmake/generator.toml +++ b/build/export_generators/hardcoded-cmake/generator.toml @@ -84,7 +84,7 @@ attrs=[ "target_sources_custom", "use_export_script", "add_yunittest", - "set_yunittest_property", + "set_yunittest_property", ] copy=[ "cmake/common.cmake", diff --git a/build/ymake.core.conf b/build/ymake.core.conf index 1ccfa2d48d3..bfbe7f888ed 100644 --- a/build/ymake.core.conf +++ b/build/ymake.core.conf @@ -1248,6 +1248,7 @@ UNITTEST_SEM=$CPP_PROGRAM_SEM \ && add_yunittest NAME $REALPRJNAME TEST_TARGET $REALPRJNAME TEST_ARG --print-before-suite --print-before-test --fork-tests --print-times --show-fails \ && set_yunittest_property TEST $REALPRJNAME PROPERTY LABELS $TEST_SIZE_NAME $FILTER_ONLY_TEST_TAGS \ && add_ytest_requirements $REALPRJNAME $DEFAULT_REQUIREMENTS $TEST_REQUIREMENTS_VALUE \ + && set_yunittest_property_escaped TEST $REALPRJNAME PROPERTY ENVIRONMENT $TEST_ENV_VALUE \ $_TEST_TIMEOUT_SEM # tag:test @@ -1301,6 +1302,7 @@ GTEST_SEM=$CPP_PROGRAM_SEM \ && add_test NAME $REALPRJNAME COMMAND $REALPRJNAME \ && set_property TEST $REALPRJNAME PROPERTY LABELS $TEST_SIZE_NAME $FILTER_ONLY_TEST_TAGS \ && add_test_requirements $REALPRJNAME $DEFAULT_REQUIREMENTS $TEST_REQUIREMENTS_VALUE \ + && set_property_escaped TEST $REALPRJNAME PROPERTY ENVIRONMENT $TEST_ENV_VALUE \ $_TEST_TIMEOUT_SEM # tag:cpp-specific tag:test diff --git a/cmake/common.cmake b/cmake/common.cmake index 0ffe61ad175..f85875ec405 100644 --- a/cmake/common.cmake +++ b/cmake/common.cmake @@ -296,13 +296,13 @@ function(set_yunittest_property) get_property(SPLIT_FACTOR TARGET ${YUNITTEST_ARGS_TEST} PROPERTY SPLIT_FACTOR) if ((${SPLIT_FACTOR} EQUAL 1) OR (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/run_testpack")) - set_property(TEST ${YUNITTEST_ARGS_TEST} PROPERTY ${YUNITTEST_ARGS_PROPERTY} ${YUNITTEST_ARGS_UNPARSED_ARGUMENTS}) + set_property(TEST ${YUNITTEST_ARGS_TEST} PROPERTY ${YUNITTEST_ARGS_PROPERTY} "${YUNITTEST_ARGS_UNPARSED_ARGUMENTS}") return() endif() math(EXPR LastIdx "${SPLIT_FACTOR} - 1") foreach(Idx RANGE ${LastIdx}) - set_property(TEST ${YUNITTEST_ARGS_TEST}_${Idx} PROPERTY ${YUNITTEST_ARGS_PROPERTY} ${YUNITTEST_ARGS_UNPARSED_ARGUMENTS}) + set_property(TEST ${YUNITTEST_ARGS_TEST}_${Idx} PROPERTY ${YUNITTEST_ARGS_PROPERTY} "${YUNITTEST_ARGS_UNPARSED_ARGUMENTS}") endforeach() endfunction() |