external
/
uhub
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename the test binary to autotest-bin, to avoid naming conflicts for the reserved 'test' target.

This commit is contained in:
Jan Vidar Krey 2018-02-19 11:45:11 +01:00
parent fd05f13fe4
commit ba19048ebc
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CMakeLists.txt
View File

@ -107,7 +107,7 @@ add_dependencies(adc utils)
add_dependencies(network utils) add_dependencies(network utils)
add_executable(uhub ${PROJECT_SOURCE_DIR}/core/main.c ${uhub_SOURCES} ) add_executable(uhub ${PROJECT_SOURCE_DIR}/core/main.c ${uhub_SOURCES} )
add_executable(test ${CMAKE_SOURCE_DIR}/autotest/test.c ${uhub_SOURCES} ) add_executable(autotest-bin ${CMAKE_SOURCE_DIR}/autotest/test.c ${uhub_SOURCES} )
add_executable(uhub-passwd ${PROJECT_SOURCE_DIR}/tools/uhub-passwd.c) add_executable(uhub-passwd ${PROJECT_SOURCE_DIR}/tools/uhub-passwd.c)
add_library(mod_example MODULE ${PROJECT_SOURCE_DIR}/plugins/mod_example.c) add_library(mod_example MODULE ${PROJECT_SOURCE_DIR}/plugins/mod_example.c)
@ -123,7 +123,7 @@ add_library(mod_auth_sqlite MODULE ${PROJECT_SOURCE_DIR}/plugins/mod_auth_sqlite
if(WIN32) if(WIN32)
target_link_libraries(uhub ws2_32) target_link_libraries(uhub ws2_32)
target_link_libraries(test ws2_32) target_link_libraries(autotest-bin ws2_32)
target_link_libraries(mod_logging ws2_32) target_link_libraries(mod_logging ws2_32)
target_link_libraries(mod_welcome ws2_32) target_link_libraries(mod_welcome ws2_32)
endif() endif()
@ -143,7 +143,7 @@ set_target_properties(
target_link_libraries(uhub ${CMAKE_DL_LIBS} adc network utils) target_link_libraries(uhub ${CMAKE_DL_LIBS} adc network utils)
target_link_libraries(uhub-passwd ${SQLITE3_LIBRARIES} utils) target_link_libraries(uhub-passwd ${SQLITE3_LIBRARIES} utils)
target_link_libraries(test ${CMAKE_DL_LIBS} adc network utils) target_link_libraries(autotest-bin ${CMAKE_DL_LIBS} adc network utils)
target_link_libraries(mod_example utils) target_link_libraries(mod_example utils)
target_link_libraries(mod_welcome utils) target_link_libraries(mod_welcome utils)
target_link_libraries(mod_auth_simple utils) target_link_libraries(mod_auth_simple utils)
@ -164,7 +164,7 @@ if(UNIX)
add_executable(uhub-admin ${PROJECT_SOURCE_DIR}/tools/admin.c) add_executable(uhub-admin ${PROJECT_SOURCE_DIR}/tools/admin.c)
target_link_libraries(uhub-admin adcclient adc network utils pthread) target_link_libraries(uhub-admin adcclient adc network utils pthread)
target_link_libraries(uhub pthread) target_link_libraries(uhub pthread)
target_link_libraries(test pthread) target_link_libraries(autotest-bin pthread)
if (ADC_STRESS) if (ADC_STRESS)
add_executable(adcrush ${PROJECT_SOURCE_DIR}/tools/adcrush.c ${adcclient_SOURCES}) add_executable(adcrush ${PROJECT_SOURCE_DIR}/tools/adcrush.c ${adcclient_SOURCES})
@ -203,7 +203,7 @@ endif()
if(SSL_SUPPORT) if(SSL_SUPPORT)
target_link_libraries(uhub ${SSL_LIBS}) target_link_libraries(uhub ${SSL_LIBS})
target_link_libraries(test ${SSL_LIBS}) target_link_libraries(autotest-bin ${SSL_LIBS})
if(UNIX) if(UNIX)
target_link_libraries(uhub-admin ${SSL_LIBS}) target_link_libraries(uhub-admin ${SSL_LIBS})
endif() endif()
@ -216,7 +216,7 @@ endif()
if (SYSTEMD_SUPPORT) if (SYSTEMD_SUPPORT)
target_link_libraries(uhub ${SD_LIBRARIES}) target_link_libraries(uhub ${SD_LIBRARIES})
target_link_libraries(test ${SD_LIBRARIES}) target_link_libraries(autotest-bin ${SD_LIBRARIES})
target_link_libraries(uhub-passwd ${SD_LIBRARIES}) target_link_libraries(uhub-passwd ${SD_LIBRARIES})
target_link_libraries(uhub-admin ${SD_LIBRARIES}) target_link_libraries(uhub-admin ${SD_LIBRARIES})
include_directories(${SD_INCLUDE_DIRS}) include_directories(${SD_INCLUDE_DIRS})

4
autotest/travis/build-and-test.sh
View File

@ -34,8 +34,8 @@ cmake ${CMAKEOPTS} \
make VERBOSE=1 make VERBOSE=1
make VERBOSE=1 test make VERBOSE=1 autotest-bin
./test ./autotest-bin
sudo make install sudo make install