mirror of
https://github.com/moparisthebest/curl
synced 2024-12-21 23:58:49 -05:00
cmake: now using BUILD_TESTING=ON/OFF
CMake build now using BUILD_TESTING=ON/OFF (default is OFF) to build tests and enabling CTest integration. Options BUILD_CURL_TESTS and BUILD_DASHBOARD_REPORTS was removed. Closes #882 Reviewed-by: Brad King
This commit is contained in:
parent
0bdec5e01d
commit
12e21fab26
@ -72,7 +72,6 @@ include_directories(${PROJECT_BINARY_DIR}/include/curl)
|
|||||||
include_directories( ${CURL_SOURCE_DIR}/include )
|
include_directories( ${CURL_SOURCE_DIR}/include )
|
||||||
|
|
||||||
option(BUILD_CURL_EXE "Set to ON to build cURL executable." ON)
|
option(BUILD_CURL_EXE "Set to ON to build cURL executable." ON)
|
||||||
option(BUILD_CURL_TESTS "Set to ON to build cURL tests." ON)
|
|
||||||
option(CURL_STATICLIB "Set to ON to build libcurl with static linking." OFF)
|
option(CURL_STATICLIB "Set to ON to build libcurl with static linking." OFF)
|
||||||
option(ENABLE_ARES "Set to ON to enable c-ares support" OFF)
|
option(ENABLE_ARES "Set to ON to enable c-ares support" OFF)
|
||||||
option(ENABLE_THREADED_RESOLVER "Set to ON to enable POSIX threaded DNS lookup" OFF)
|
option(ENABLE_THREADED_RESOLVER "Set to ON to enable POSIX threaded DNS lookup" OFF)
|
||||||
@ -108,12 +107,6 @@ if(ENABLE_ARES)
|
|||||||
set(CURL_LIBS ${CURL_LIBS} ${CARES_LIBRARY})
|
set(CURL_LIBS ${CURL_LIBS} ${CARES_LIBRARY})
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
option(BUILD_DASHBOARD_REPORTS "Set to ON to activate reporting of cURL builds here http://www.cdash.org/CDashPublic/index.php?project=CURL" OFF)
|
|
||||||
if(BUILD_DASHBOARD_REPORTS)
|
|
||||||
#INCLUDE(Dart)
|
|
||||||
include(CTest)
|
|
||||||
endif(BUILD_DASHBOARD_REPORTS)
|
|
||||||
|
|
||||||
if(MSVC)
|
if(MSVC)
|
||||||
option(BUILD_RELEASE_DEBUG_DIRS "Set OFF to build each configuration to a separate directory" OFF)
|
option(BUILD_RELEASE_DEBUG_DIRS "Set OFF to build each configuration to a separate directory" OFF)
|
||||||
mark_as_advanced(BUILD_RELEASE_DEBUG_DIRS)
|
mark_as_advanced(BUILD_RELEASE_DEBUG_DIRS)
|
||||||
@ -1041,7 +1034,9 @@ add_subdirectory(lib)
|
|||||||
if(BUILD_CURL_EXE)
|
if(BUILD_CURL_EXE)
|
||||||
add_subdirectory(src)
|
add_subdirectory(src)
|
||||||
endif()
|
endif()
|
||||||
if(BUILD_CURL_TESTS)
|
|
||||||
|
include(CTest)
|
||||||
|
if(BUILD_TESTING)
|
||||||
add_subdirectory(tests)
|
add_subdirectory(tests)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
add_subdirectory(data)
|
add_subdirectory(data)
|
||||||
add_subdirectory(libtest)
|
add_subdirectory(libtest)
|
||||||
add_subdirectory(server)
|
add_subdirectory(server)
|
||||||
|
add_subdirectory(unit)
|
||||||
|
46
tests/unit/CMakeLists.txt
Normal file
46
tests/unit/CMakeLists.txt
Normal file
@ -0,0 +1,46 @@
|
|||||||
|
|
||||||
|
set(UT_SRC
|
||||||
|
unit1300.c
|
||||||
|
unit1301.c
|
||||||
|
unit1302.c
|
||||||
|
unit1303.c
|
||||||
|
unit1304.c
|
||||||
|
unit1305.c
|
||||||
|
unit1307.c
|
||||||
|
unit1308.c
|
||||||
|
unit1309.c
|
||||||
|
unit1330.c
|
||||||
|
# Broken link on Linux
|
||||||
|
# unit1394.c
|
||||||
|
unit1395.c
|
||||||
|
unit1396.c
|
||||||
|
unit1397.c
|
||||||
|
unit1398.c
|
||||||
|
unit1600.c
|
||||||
|
unit1601.c
|
||||||
|
unit1603.c
|
||||||
|
# Broken link on Linux
|
||||||
|
# unit1604.c
|
||||||
|
)
|
||||||
|
|
||||||
|
set(UT_COMMON_FILES ../libtest/first.c ../libtest/test.h curlcheck.h)
|
||||||
|
include_directories(
|
||||||
|
${CURL_SOURCE_DIR}/lib # To be able to reach "curl_setup_once.h"
|
||||||
|
${CURL_SOURCE_DIR}/tests/libtest
|
||||||
|
${CURL_SOURCE_DIR}/src
|
||||||
|
${CURL_BINARY_DIR}/lib # To be able to reach "curl_config.h"
|
||||||
|
${CURL_BINARY_DIR}/include # To be able to reach "curl/curlbuild.h"
|
||||||
|
)
|
||||||
|
|
||||||
|
foreach(_testfile ${UT_SRC})
|
||||||
|
|
||||||
|
get_filename_component(_testname ${_testfile} NAME_WE)
|
||||||
|
add_executable(${_testname} ${_testfile} ${UT_COMMON_FILES})
|
||||||
|
target_link_libraries(${_testname} libcurl ${CURL_LIBS})
|
||||||
|
set_target_properties(${_testname}
|
||||||
|
PROPERTIES COMPILE_DEFINITIONS "UNITTESTS")
|
||||||
|
|
||||||
|
add_test(NAME ${_testname}
|
||||||
|
COMMAND ${_testname} "http://www.google.com"
|
||||||
|
)
|
||||||
|
endforeach()
|
Loading…
Reference in New Issue
Block a user