aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Koo <steven.koo@ni.com>2022-01-10 14:37:42 -0600
committerAaron Rossetto <aaron.rossetto@ni.com>2022-01-19 14:28:32 -0600
commit2084d781ede89f60c75030f092fe89ce66f8767c (patch)
treeac59bd8a9589858807071d5be7e072f1eff96ab3
parent568c02c0e75e6d6e3cfb10a14ed321816719695a (diff)
downloaduhd-2084d781ede89f60c75030f092fe89ce66f8767c.tar.gz
uhd-2084d781ede89f60c75030f092fe89ce66f8767c.tar.bz2
uhd-2084d781ede89f60c75030f092fe89ce66f8767c.zip
tests: disable x4xx_radio_block_test on macOS
This commit disables x4xx_radio_block_test on macOS because the platform has stricter casting and symbol export rules, which causes this test to fail. Signed-off-by: Steven Koo <steven.koo@ni.com>
-rw-r--r--host/lib/usrp/x400/x400_radio_control.cpp1
-rw-r--r--host/tests/CMakeLists.txt57
2 files changed, 32 insertions, 26 deletions
diff --git a/host/lib/usrp/x400/x400_radio_control.cpp b/host/lib/usrp/x400/x400_radio_control.cpp
index 75719f6a2..528330101 100644
--- a/host/lib/usrp/x400/x400_radio_control.cpp
+++ b/host/lib/usrp/x400/x400_radio_control.cpp
@@ -52,6 +52,7 @@ x400_radio_control_impl::x400_radio_control_impl(make_args_ptr make_args)
UHD_ASSERT_THROW(get_mb_controller());
_mb_control = std::dynamic_pointer_cast<mpmd_mb_controller>(get_mb_controller());
+ UHD_ASSERT_THROW(_mb_control)
_x4xx_timekeeper = std::dynamic_pointer_cast<mpmd_mb_controller::mpmd_timekeeper>(
_mb_control->get_timekeeper(0));
diff --git a/host/tests/CMakeLists.txt b/host/tests/CMakeLists.txt
index 7857c00d5..b8c40ebeb 100644
--- a/host/tests/CMakeLists.txt
+++ b/host/tests/CMakeLists.txt
@@ -366,32 +366,37 @@ UHD_ADD_RFNOC_BLOCK_TEST(
)
IF(ENABLE_X400)
- UHD_ADD_RFNOC_BLOCK_TEST(
- TARGET x4xx_radio_block_test.cpp
- EXTRA_SOURCES
- ${UHD_SOURCE_DIR}/lib/usrp/common/lmx2572.cpp
- ${UHD_SOURCE_DIR}/lib/usrp/common/pwr_cal_mgr.cpp
- ${UHD_SOURCE_DIR}/lib/usrp/x400/x400_gpio_control.cpp
- ${UHD_SOURCE_DIR}/lib/usrp/x400/x400_radio_control.cpp
- ${UHD_SOURCE_DIR}/lib/usrp/x400/x400_rfdc_control.cpp
- ${UHD_SOURCE_DIR}/lib/usrp/x400/adc_self_calibration.cpp
- ${UHD_SOURCE_DIR}/lib/rfnoc/radio_control_impl.cpp
- ${UHD_SOURCE_DIR}/lib/rfnoc/rf_control/antenna.cpp
- ${UHD_SOURCE_DIR}/lib/rfnoc/rf_control/gain_profile.cpp
- ${UHD_SOURCE_DIR}/lib/usrp/mpmd/mpmd_mb_controller.cpp
- ${UHD_SOURCE_DIR}/lib/usrp/dboard/zbx/zbx_dboard.cpp
- ${UHD_SOURCE_DIR}/lib/usrp/dboard/zbx/zbx_dboard_init.cpp
- ${UHD_SOURCE_DIR}/lib/usrp/dboard/zbx/zbx_lo_ctrl.cpp
- ${UHD_SOURCE_DIR}/lib/usrp/dboard/zbx/zbx_cpld_ctrl.cpp
- ${UHD_SOURCE_DIR}/lib/usrp/dboard/zbx/zbx_expert.cpp
- ${UHD_SOURCE_DIR}/lib/utils/compat_check.cpp
- ${UHD_SOURCE_DIR}/lib/features/discoverable_feature_registry.cpp
- ${UHD_SOURCE_DIR}/lib/usrp/cores/gpio_atr_3000.cpp
- ${UHD_SOURCE_DIR}/lib/usrp/cores/spi_core_4000.cpp
- $<TARGET_OBJECTS:uhd_rpclib>
- INCLUDE_DIRS ${UHD_SOURCE_DIR}/lib/deps/rpclib/include
- INCLUDE_DIRS ${UHD_SOURCE_DIR}/lib/deps/flatbuffers/include
- )
+ if (NOT APPLE)
+ # This test isn't supported on macOS because there are
+ # stricter casting and symbol export rules on this platform.
+ # As a result this test fails when enabled.
+ UHD_ADD_RFNOC_BLOCK_TEST(
+ TARGET x4xx_radio_block_test.cpp
+ EXTRA_SOURCES
+ ${UHD_SOURCE_DIR}/lib/usrp/common/lmx2572.cpp
+ ${UHD_SOURCE_DIR}/lib/usrp/common/pwr_cal_mgr.cpp
+ ${UHD_SOURCE_DIR}/lib/usrp/x400/x400_gpio_control.cpp
+ ${UHD_SOURCE_DIR}/lib/usrp/x400/x400_radio_control.cpp
+ ${UHD_SOURCE_DIR}/lib/usrp/x400/x400_rfdc_control.cpp
+ ${UHD_SOURCE_DIR}/lib/usrp/x400/adc_self_calibration.cpp
+ ${UHD_SOURCE_DIR}/lib/rfnoc/radio_control_impl.cpp
+ ${UHD_SOURCE_DIR}/lib/rfnoc/rf_control/antenna.cpp
+ ${UHD_SOURCE_DIR}/lib/rfnoc/rf_control/gain_profile.cpp
+ ${UHD_SOURCE_DIR}/lib/usrp/mpmd/mpmd_mb_controller.cpp
+ ${UHD_SOURCE_DIR}/lib/usrp/dboard/zbx/zbx_dboard.cpp
+ ${UHD_SOURCE_DIR}/lib/usrp/dboard/zbx/zbx_dboard_init.cpp
+ ${UHD_SOURCE_DIR}/lib/usrp/dboard/zbx/zbx_lo_ctrl.cpp
+ ${UHD_SOURCE_DIR}/lib/usrp/dboard/zbx/zbx_cpld_ctrl.cpp
+ ${UHD_SOURCE_DIR}/lib/usrp/dboard/zbx/zbx_expert.cpp
+ ${UHD_SOURCE_DIR}/lib/utils/compat_check.cpp
+ ${UHD_SOURCE_DIR}/lib/features/discoverable_feature_registry.cpp
+ ${UHD_SOURCE_DIR}/lib/usrp/cores/gpio_atr_3000.cpp
+ ${UHD_SOURCE_DIR}/lib/usrp/cores/spi_core_4000.cpp
+ $<TARGET_OBJECTS:uhd_rpclib>
+ INCLUDE_DIRS ${UHD_SOURCE_DIR}/lib/deps/rpclib/include
+ INCLUDE_DIRS ${UHD_SOURCE_DIR}/lib/deps/flatbuffers/include
+ )
+ endif(NOT APPLE)
UHD_ADD_NONAPI_TEST(
TARGET "x400_rfdc_control_test.cpp"