YourWishes/jerryscript
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix cmakelists of doctests to run generation only once (#2347)

Browse Source 
Custom commands with outputs used in multiple targets are prone to
being executed multiple times in parallel builds (and the repeated
overwrites of the outputs may lead to various hard-to-debug
errors). The fix is to add a custom target that depends on the
custom command and make the existing targets using the outputs
depend on the new custom target.

JerryScript-DCO-1.0-Signed-off-by: Akos Kiss akiss@inf.u-szeged.hu
This commit is contained in:
Akos Kiss
2018-05-22 09:14:18 +02:00
committed by Robert Sipka
parent 299643400d
commit cc473425d3
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/unit-doc/CMakeLists.txt
+6
View File
@@ -59,10 +59,15 @@ add_custom_command(
COMMENT "Generating doctests" COMMENT "Generating doctests"
) )
# Add custom target to trigger the custom command above. Targets below can/must
# depend on this one so that the custom command gets executed only once.
add_custom_target(all-doc-files DEPENDS ${DOCTEST_COMPILE} ${DOCTEST_LINK} ${DOCTEST_RUN})
# Process compile-only doctests: add them to a dummy library # Process compile-only doctests: add them to a dummy library
# (named libcompile-doc-tests.a) to trigger compilation. # (named libcompile-doc-tests.a) to trigger compilation.
if(NOT ("${DOCTEST_COMPILE}" STREQUAL "")) if(NOT ("${DOCTEST_COMPILE}" STREQUAL ""))
add_library(compile-doc-tests STATIC ${DOCTEST_COMPILE}) add_library(compile-doc-tests STATIC ${DOCTEST_COMPILE})
add_dependencies(compile-doc-tests all-doc-files)
target_link_libraries(compile-doc-tests jerry-ext jerry-core jerry-port-default-minimal) target_link_libraries(compile-doc-tests jerry-ext jerry-core jerry-port-default-minimal)
set_property(TARGET compile-doc-tests APPEND_STRING PROPERTY COMPILE_FLAGS "${COMPILE_FLAGS_DOCTEST}") set_property(TARGET compile-doc-tests APPEND_STRING PROPERTY COMPILE_FLAGS "${COMPILE_FLAGS_DOCTEST}")
endif() endif()
@@ -74,6 +79,7 @@ macro(doctest_add_executables NAME_PREFIX)
set(TARGET_NAME ${NAME_PREFIX}-${TARGET_NAME}) set(TARGET_NAME ${NAME_PREFIX}-${TARGET_NAME})
add_executable(${TARGET_NAME} ${DOCTEST_NAME}) add_executable(${TARGET_NAME} ${DOCTEST_NAME})
add_dependencies(${TARGET_NAME} all-doc-files)
set_property(TARGET ${TARGET_NAME} APPEND_STRING PROPERTY COMPILE_FLAGS "${COMPILE_FLAGS_DOCTEST}") set_property(TARGET ${TARGET_NAME} APPEND_STRING PROPERTY COMPILE_FLAGS "${COMPILE_FLAGS_DOCTEST}")
set_property(TARGET ${TARGET_NAME} PROPERTY LINK_FLAGS "${LINKER_FLAGS_COMMON}") set_property(TARGET ${TARGET_NAME} PROPERTY LINK_FLAGS "${LINKER_FLAGS_COMMON}")
target_link_libraries(${TARGET_NAME} jerry-ext jerry-core jerry-port-default-minimal) target_link_libraries(${TARGET_NAME} jerry-ext jerry-core jerry-port-default-minimal)