aboutsummaryrefslogtreecommitdiffstats
path: root/host/tests
diff options
context:
space:
mode:
authorMartin Braun <martin.braun@ettus.com>2018-11-13 21:53:22 -0800
committerBrent Stapleton <bstapleton@g.hmc.edu>2018-11-14 14:10:09 -0800
commita69ab0c23a0c38e3fed3e412df36538d8959d23c (patch)
treee6669a138dad84f79c46588f43a38c69dda90246 /host/tests
parent4247f025020d7dd1f696dfbd3cce248957d6ace7 (diff)
downloaduhd-a69ab0c23a0c38e3fed3e412df36538d8959d23c.tar.gz
uhd-a69ab0c23a0c38e3fed3e412df36538d8959d23c.tar.bz2
uhd-a69ab0c23a0c38e3fed3e412df36538d8959d23c.zip
cmake: Update coding style to use lowercase commands
Also updates our coding style file. Ancient CMake versions required upper-case commands. Later command names became case-insensitive. Now the preferred style is lower-case. Run the following shell code (with GNU compliant sed): cmake --help-command-list | grep -v "cmake version" | while read c; do echo 's/\b'"$(echo $c | tr '[:lower:]' '[:upper:]')"'\(\s*\)(/'"$c"'\1(/g' done > convert.sed \ && git ls-files -z -- bootstrap '*.cmake' '*.cmake.in' \ '*CMakeLists.txt' | xargs -0 gsed -i -f convert.sed && rm convert.sed (Make sure the backslashes don't get mangled!)
Diffstat (limited to 'host/tests')
-rw-r--r--host/tests/CMakeLists.txt78
-rw-r--r--host/tests/common/CMakeLists.txt4
-rw-r--r--host/tests/devtest/CMakeLists.txt30
3 files changed, 56 insertions, 56 deletions
diff --git a/host/tests/CMakeLists.txt b/host/tests/CMakeLists.txt
index 0424b1b53..4b068321b 100644
--- a/host/tests/CMakeLists.txt
+++ b/host/tests/CMakeLists.txt
@@ -13,15 +13,15 @@ include(UHDUnitTest)
########################################################################
# build test common
########################################################################
-SET(test_common_SOURCEDIR ${CMAKE_CURRENT_SOURCE_DIR}/common)
-ADD_SUBDIRECTORY(common)
-LINK_DIRECTORIES(test_common_SOURCEDIR)
+set(test_common_SOURCEDIR ${CMAKE_CURRENT_SOURCE_DIR}/common)
+add_subdirectory(common)
+link_directories(test_common_SOURCEDIR)
########################################################################
# unit test suite
########################################################################
-SET(test_sources
+set(test_sources
addr_test.cpp
buffer_test.cpp
byteswap_test.cpp
@@ -55,10 +55,10 @@ SET(test_sources
)
#turn each test cpp file into an executable with an int main() function
-ADD_DEFINITIONS(-DBOOST_TEST_DYN_LINK -DBOOST_TEST_MAIN)
+add_definitions(-DBOOST_TEST_DYN_LINK -DBOOST_TEST_MAIN)
-IF(ENABLE_RFNOC)
- LIST(APPEND test_sources
+if(ENABLE_RFNOC)
+ list(APPEND test_sources
block_id_test.cpp
blockdef_test.cpp
device3_test.cpp
@@ -68,10 +68,10 @@ IF(ENABLE_RFNOC)
stream_sig_test.cpp
tick_node_test.cpp
)
-ENDIF(ENABLE_RFNOC)
+endif(ENABLE_RFNOC)
-IF(ENABLE_C_API)
- LIST(APPEND test_sources
+if(ENABLE_C_API)
+ list(APPEND test_sources
eeprom_c_test.c
error_c_test.cpp
ranges_c_test.c
@@ -79,54 +79,54 @@ IF(ENABLE_C_API)
string_vector_c_test.c
subdev_spec_c_test.c
)
-ENDIF(ENABLE_C_API)
+endif(ENABLE_C_API)
-INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/lib/include")
-INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}/common")
+include_directories("${CMAKE_SOURCE_DIR}/lib/include")
+include_directories("${CMAKE_CURRENT_SOURCE_DIR}/common")
#for each source: build an executable, register it as a test
-FOREACH(test_source ${test_sources})
- GET_FILENAME_COMPONENT(test_name ${test_source} NAME_WE)
- ADD_EXECUTABLE(${test_name} ${test_source})
- TARGET_LINK_LIBRARIES(${test_name} uhd uhd_test ${Boost_LIBRARIES})
+foreach(test_source ${test_sources})
+ get_filename_component(test_name ${test_source} NAME_WE)
+ add_executable(${test_name} ${test_source})
+ target_link_libraries(${test_name} uhd uhd_test ${Boost_LIBRARIES})
UHD_ADD_TEST(${test_name} ${test_name})
UHD_INSTALL(TARGETS ${test_name} RUNTIME DESTINATION ${PKG_LIB_DIR}/tests COMPONENT tests)
-ENDFOREACH(test_source)
+endforeach(test_source)
# Other tests that don't directly link with libuhd: (TODO find a nicer way to do this)
-INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/lib/rfnoc/nocscript/)
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/lib/rfnoc/nocscript/)
-ADD_EXECUTABLE(nocscript_expr_test
+include_directories(${CMAKE_BINARY_DIR}/lib/rfnoc/nocscript/)
+include_directories(${CMAKE_SOURCE_DIR}/lib/rfnoc/nocscript/)
+add_executable(nocscript_expr_test
nocscript_expr_test.cpp
${CMAKE_SOURCE_DIR}/lib/rfnoc/nocscript/expression.cpp
)
-TARGET_LINK_LIBRARIES(nocscript_expr_test uhd ${Boost_LIBRARIES})
+target_link_libraries(nocscript_expr_test uhd ${Boost_LIBRARIES})
UHD_ADD_TEST(nocscript_expr_test nocscript_expr_test)
UHD_INSTALL(TARGETS nocscript_expr_test RUNTIME DESTINATION ${PKG_LIB_DIR}/tests COMPONENT tests)
-ADD_EXECUTABLE(nocscript_ftable_test
+add_executable(nocscript_ftable_test
nocscript_ftable_test.cpp
${CMAKE_SOURCE_DIR}/lib/rfnoc/nocscript/function_table.cpp
${CMAKE_SOURCE_DIR}/lib/rfnoc/nocscript/expression.cpp
)
-TARGET_LINK_LIBRARIES(nocscript_ftable_test uhd ${Boost_LIBRARIES})
+target_link_libraries(nocscript_ftable_test uhd ${Boost_LIBRARIES})
UHD_ADD_TEST(nocscript_ftable_test nocscript_ftable_test)
UHD_INSTALL(TARGETS nocscript_ftable_test RUNTIME DESTINATION ${PKG_LIB_DIR}/tests COMPONENT tests)
-ADD_EXECUTABLE(nocscript_parser_test
+add_executable(nocscript_parser_test
nocscript_parser_test.cpp
${CMAKE_SOURCE_DIR}/lib/rfnoc/nocscript/parser.cpp
${CMAKE_SOURCE_DIR}/lib/rfnoc/nocscript/function_table.cpp
${CMAKE_SOURCE_DIR}/lib/rfnoc/nocscript/expression.cpp
)
-TARGET_LINK_LIBRARIES(nocscript_parser_test uhd ${Boost_LIBRARIES})
+target_link_libraries(nocscript_parser_test uhd ${Boost_LIBRARIES})
UHD_ADD_TEST(nocscript_parser_test nocscript_parser_test)
UHD_INSTALL(TARGETS nocscript_parser_test RUNTIME DESTINATION ${PKG_LIB_DIR}/tests COMPONENT tests)
-ADD_EXECUTABLE(config_parser_test
+add_executable(config_parser_test
config_parser_test.cpp
${CMAKE_SOURCE_DIR}/lib/utils/config_parser.cpp
)
-TARGET_LINK_LIBRARIES(config_parser_test uhd ${Boost_LIBRARIES})
+target_link_libraries(config_parser_test uhd ${Boost_LIBRARIES})
UHD_ADD_TEST(config_parser_test config_parser_test)
UHD_INSTALL(TARGETS
config_parser_test
@@ -135,21 +135,21 @@ UHD_INSTALL(TARGETS
COMPONENT tests
)
-ADD_EXECUTABLE(paths_test
+add_executable(paths_test
paths_test.cpp
${CMAKE_SOURCE_DIR}/lib/utils/pathslib.cpp
)
# Careful: This is to satisfy the out-of-library build of paths.cpp. This is
# duplicate code from lib/utils/CMakeLists.txt, and it's been simplified.
-SET(UHD_LIB_DIR "lib")
-FILE(TO_NATIVE_PATH "${CMAKE_INSTALL_PREFIX}" UHD_PKG_PATH)
-STRING(REPLACE "\\" "\\\\" UHD_PKG_PATH "${UHD_PKG_PATH}")
-SET_SOURCE_FILES_PROPERTIES(
+set(UHD_LIB_DIR "lib")
+file(TO_NATIVE_PATH "${CMAKE_INSTALL_PREFIX}" UHD_PKG_PATH)
+string(REPLACE "\\" "\\\\" UHD_PKG_PATH "${UHD_PKG_PATH}")
+set_source_files_properties(
${CMAKE_SOURCE_DIR}/lib/utils/paths.cpp
PROPERTIES COMPILE_DEFINITIONS
"UHD_PKG_PATH=\"${UHD_PKG_PATH}\";UHD_LIB_DIR=\"${UHD_LIB_DIR}\""
)
-TARGET_LINK_LIBRARIES(paths_test uhd ${Boost_LIBRARIES})
+target_link_libraries(paths_test uhd ${Boost_LIBRARIES})
UHD_ADD_TEST(paths_test paths_test)
UHD_INSTALL(TARGETS
paths_test
@@ -161,9 +161,9 @@ UHD_INSTALL(TARGETS
########################################################################
# demo of a loadable module
########################################################################
-IF(MSVC OR APPLE OR LINUX)
- ADD_LIBRARY(module_test MODULE module_test.cpp)
- TARGET_LINK_LIBRARIES(module_test uhd)
-ENDIF()
+if(MSVC OR APPLE OR LINUX)
+ add_library(module_test MODULE module_test.cpp)
+ target_link_libraries(module_test uhd)
+endif()
-ADD_SUBDIRECTORY(devtest)
+add_subdirectory(devtest)
diff --git a/host/tests/common/CMakeLists.txt b/host/tests/common/CMakeLists.txt
index 91a70dfae..e48e85c2f 100644
--- a/host/tests/common/CMakeLists.txt
+++ b/host/tests/common/CMakeLists.txt
@@ -7,8 +7,8 @@
########################################################################
# Build uhd_test static lib
########################################################################
-INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/lib/include")
-ADD_LIBRARY(uhd_test ${CMAKE_CURRENT_SOURCE_DIR}/mock_ctrl_iface_impl.cpp
+include_directories("${CMAKE_SOURCE_DIR}/lib/include")
+add_library(uhd_test ${CMAKE_CURRENT_SOURCE_DIR}/mock_ctrl_iface_impl.cpp
${CMAKE_CURRENT_SOURCE_DIR}/mock_zero_copy.cpp
${CMAKE_SOURCE_DIR}/lib/rfnoc/graph_impl.cpp
${CMAKE_SOURCE_DIR}/lib/rfnoc/async_msg_handler.cpp
diff --git a/host/tests/devtest/CMakeLists.txt b/host/tests/devtest/CMakeLists.txt
index 0bce8050d..69acc638f 100644
--- a/host/tests/devtest/CMakeLists.txt
+++ b/host/tests/devtest/CMakeLists.txt
@@ -6,10 +6,10 @@
#
# Formatting
-MESSAGE(STATUS "")
+message(STATUS "")
# All devtest files get installed:
-FILE(GLOB py_devtest_files "*.py")
+file(GLOB py_devtest_files "*.py")
UHD_INSTALL(PROGRAMS
${py_devtest_files}
DESTINATION ${PKG_LIB_DIR}/tests/devtest
@@ -20,9 +20,9 @@ UHD_INSTALL(PROGRAMS
# - pattern: This will be used to identify which devtest_*.py is to be executed.
# - filter: Will be used in args strings as "type=<filter>".
# - devtype: A descriptive string. Is only used for CMake output.
-MACRO(ADD_DEVTEST pattern filter devtype)
- MESSAGE(STATUS "Adding ${devtype} device test target")
- ADD_CUSTOM_TARGET("test_${pattern}"
+macro(ADD_DEVTEST pattern filter devtype)
+ message(STATUS "Adding ${devtype} device test target")
+ add_custom_target("test_${pattern}"
${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/run_testsuite.py
"--src-dir" "${CMAKE_CURRENT_SOURCE_DIR}"
"--devtest-pattern" "${pattern}"
@@ -32,20 +32,20 @@ MACRO(ADD_DEVTEST pattern filter devtype)
COMMENT "Running device test on all connected ${devtype} devices:"
WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
)
-ENDMACRO(ADD_DEVTEST)
+endmacro(ADD_DEVTEST)
-IF(ENABLE_B200)
+if(ENABLE_B200)
ADD_DEVTEST("b2xx" "b200" "B2XX")
-ENDIF(ENABLE_B200)
-IF(ENABLE_X300)
+endif(ENABLE_B200)
+if(ENABLE_X300)
ADD_DEVTEST("x3x0" "x300" "X3x0")
-ENDIF(ENABLE_X300)
-IF(ENABLE_E300)
+endif(ENABLE_X300)
+if(ENABLE_E300)
ADD_DEVTEST("e3xx" "e3x0" "E3XX")
-ENDIF(ENABLE_E300)
-IF(ENABLE_MPMD)
+endif(ENABLE_E300)
+if(ENABLE_MPMD)
ADD_DEVTEST("n3x0" "n3xx" "N3XX")
ADD_DEVTEST("e320" "e3xx" "E32x")
-ENDIF(ENABLE_MPMD)
+endif(ENABLE_MPMD)
# Formatting
-MESSAGE(STATUS "")
+message(STATUS "")