Skip to content

Commit

Permalink
Merge pull request #770 from klickverbot/build-core-internal
Browse files Browse the repository at this point in the history
Include core.internal.* in druntime build.
  • Loading branch information
dnadlinger committed Nov 13, 2014
2 parents 1f4f9d1 + 2736d8f commit 93c43ff
Showing 1 changed file with 18 additions and 11 deletions.
29 changes: 18 additions & 11 deletions runtime/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,10 @@ set(PHOBOS2_DIR ${PROJECT_SOURCE_DIR}/phobos CACHE PATH "Phobos root directory")
# Gather source files.
#

file(GLOB CORE_D ${RUNTIME_DIR}/src/core/*.d )
file(GLOB CORE_D_SYNC ${RUNTIME_DIR}/src/core/sync/*.d )
file(GLOB CORE_D_STDC ${RUNTIME_DIR}/src/core/stdc/*.d )
file(GLOB CORE_D ${RUNTIME_DIR}/src/core/*.d)
file(GLOB_RECURSE CORE_D_INTERNAL ${RUNTIME_DIR}/src/core/internal/*.d)
file(GLOB CORE_D_SYNC ${RUNTIME_DIR}/src/core/sync/*.d)
file(GLOB CORE_D_STDC ${RUNTIME_DIR}/src/core/stdc/*.d)
file(GLOB_RECURSE GC_D ${RUNTIME_DIR}/src/gc/*.d)
file(GLOB_RECURSE DCRT_D ${RUNTIME_DIR}/src/rt/*.d)
file(GLOB_RECURSE LDC_D ${RUNTIME_DIR}/src/ldc/*.d)
Expand Down Expand Up @@ -121,7 +122,7 @@ elseif(WIN32)
endif()
list(REMOVE_ITEM DCRT_C ${RUNTIME_DIR}/src/rt/monitor.c)
endif()
list(APPEND CORE_D ${CORE_D_SYNC} ${CORE_D_SYS} ${CORE_D_STDC})
list(APPEND CORE_D ${CORE_D_INTERNAL} ${CORE_D_SYNC} ${CORE_D_SYS} ${CORE_D_STDC})
list(APPEND CORE_D ${LDC_D} ${RUNTIME_DIR}/src/object_.d)
file(GLOB CORE_C ${RUNTIME_DIR}/src/core/stdc/*.c)

Expand Down Expand Up @@ -743,13 +744,19 @@ endmacro()
function(add_tests d_files runner name_suffix)
foreach(file ${d_files})
file_to_module_name(${file} module)
add_test(NAME "${module}${name_suffix}"
WORKING_DIRECTORY "${PROJECT_BINARY_DIR}"
COMMAND ${runner}-test-runner${name_suffix} ${module}
)
set_tests_properties("${module}${name_suffix}" PROPERTIES
DEPENDS build-${runner}-test-runner${name_suffix}
)
if("${module}" STREQUAL "core.internal.convert")
# Exclude unit tests for now, as they fail due to a CTFE vs. runtime
# issue with floating point numbers. See the discussion on GitHub
# pull request #770. To be revisited after 0.15.0 is out.
else()
add_test(NAME "${module}${name_suffix}"
WORKING_DIRECTORY "${PROJECT_BINARY_DIR}"
COMMAND ${runner}-test-runner${name_suffix} ${module}
)
set_tests_properties("${module}${name_suffix}" PROPERTIES
DEPENDS build-${runner}-test-runner${name_suffix}
)
endif()
endforeach()
endfunction()
function(add_runtime_tests name_suffix)
Expand Down

0 comments on commit 93c43ff

Please sign in to comment.