aboutsummaryrefslogtreecommitdiffstats
path: root/host/tests
diff options
context:
space:
mode:
authorMartin Braun <martin.braun@ettus.com>2021-01-08 09:33:36 +0100
committerAaron Rossetto <aaron.rossetto@ni.com>2021-03-04 08:07:26 -0600
commit107a49c0c236940da7d3bd0f57da4bc1e2a34cb4 (patch)
treefdeaad56030a02948377c45838dab97beb7a5c84 /host/tests
parent7d5e48032baa62cbe7467833b9e057900602f4b9 (diff)
downloaduhd-107a49c0c236940da7d3bd0f57da4bc1e2a34cb4.tar.gz
uhd-107a49c0c236940da7d3bd0f57da4bc1e2a34cb4.tar.bz2
uhd-107a49c0c236940da7d3bd0f57da4bc1e2a34cb4.zip
host: Update code base using clang-tidy
The checks from the new clang-tidy file are applied to the source tree using: $ find . -name "*.cpp" | sort -u | xargs \ --max-procs 8 --max-args 1 clang-tidy --format-style=file \ --fix -p /path/to/compile_commands.json
Diffstat (limited to 'host/tests')
-rw-r--r--host/tests/client_zero_test.cpp7
-rw-r--r--host/tests/common/mock_link.hpp4
-rw-r--r--host/tests/common/mock_zero_copy.cpp2
-rw-r--r--host/tests/common/mock_zero_copy.hpp16
-rw-r--r--host/tests/constrained_device_args_test.cpp4
-rw-r--r--host/tests/expert_test.cpp12
-rw-r--r--host/tests/mb_controller_test.cpp42
-rw-r--r--host/tests/offload_io_srv_test.cpp22
-rw-r--r--host/tests/rfnoc_block_tests/fft_block_test.cpp6
-rw-r--r--host/tests/rfnoc_block_tests/fir_filter_block_test.cpp6
-rw-r--r--host/tests/rfnoc_block_tests/fosphor_block_test.cpp6
-rw-r--r--host/tests/rfnoc_block_tests/keep_one_in_n_test.cpp2
-rw-r--r--host/tests/rfnoc_block_tests/siggen_block_test.cpp6
-rw-r--r--host/tests/rfnoc_block_tests/switchboard_block_test.cpp6
-rw-r--r--host/tests/rfnoc_block_tests/vector_iir_block_test.cpp6
-rw-r--r--host/tests/rfnoc_block_tests/window_block_test.cpp6
-rw-r--r--host/tests/rfnoc_graph_mock_nodes.hpp42
-rw-r--r--host/tests/rfnoc_node_test.cpp4
-rw-r--r--host/tests/rfnoc_propprop_test.cpp18
-rw-r--r--host/tests/rx_streamer_test.cpp2
-rw-r--r--host/tests/streamer_benchmark.cpp4
-rw-r--r--host/tests/tx_streamer_test.cpp2
22 files changed, 114 insertions, 111 deletions
diff --git a/host/tests/client_zero_test.cpp b/host/tests/client_zero_test.cpp
index 285757baf..dedf801d9 100644
--- a/host/tests/client_zero_test.cpp
+++ b/host/tests/client_zero_test.cpp
@@ -33,7 +33,7 @@ public:
read_memory[0x000C] = device_id | (DEVICE_TYPE << 16);
}
- virtual ~client_zero_test_iface() = default;
+ ~client_zero_test_iface() override = default;
/**************************************************************************
* Test API
@@ -76,7 +76,8 @@ public:
| NUM_STREAM_ENDPOINTS;
}
- void _poke_cb(uint32_t addr, uint32_t data, uhd::time_spec_t /*time*/, bool /*ack*/)
+ void _poke_cb(
+ uint32_t addr, uint32_t data, uhd::time_spec_t /*time*/, bool /*ack*/) override
{
if (addr < (1 + NUM_STREAM_ENDPOINTS) * SLOT_OFFSET
|| (addr % SLOT_OFFSET != 0 && addr % SLOT_OFFSET != 4)) {
@@ -103,7 +104,7 @@ public:
}
}
- void _peek_cb(uint32_t addr, time_spec_t /*time*/)
+ void _peek_cb(uint32_t addr, time_spec_t /*time*/) override
{
if (read_memory.count(addr) == 0) {
std::cout << "Bad peek32, addr=" << addr << std::endl;
diff --git a/host/tests/common/mock_link.hpp b/host/tests/common/mock_link.hpp
index a62aa49c7..b2c5be974 100644
--- a/host/tests/common/mock_link.hpp
+++ b/host/tests/common/mock_link.hpp
@@ -128,7 +128,7 @@ public:
_simulate_io_timeout = simulate_io_timeout;
}
- adapter_id_t get_send_adapter_id() const
+ adapter_id_t get_send_adapter_id() const override
{
return NULL_ADAPTER_ID;
}
@@ -228,7 +228,7 @@ public:
_rx_lens.push_back(len);
}
- adapter_id_t get_recv_adapter_id() const
+ adapter_id_t get_recv_adapter_id() const override
{
return NULL_ADAPTER_ID;
}
diff --git a/host/tests/common/mock_zero_copy.cpp b/host/tests/common/mock_zero_copy.cpp
index 8b9e04f64..45608584f 100644
--- a/host/tests/common/mock_zero_copy.cpp
+++ b/host/tests/common/mock_zero_copy.cpp
@@ -41,7 +41,7 @@ uhd::transport::managed_recv_buffer::sptr mock_zero_copy::get_recv_buff(double)
uhd::transport::managed_send_buffer::sptr mock_zero_copy::get_send_buff(double)
{
- if (not _reuse_send_memory or _tx_mems.size() == 0) {
+ if (not _reuse_send_memory or _tx_mems.empty()) {
_tx_mems.push_back(boost::shared_array<uint8_t>(new uint8_t[_send_frame_size]));
_tx_lens.push_back(_send_frame_size);
}
diff --git a/host/tests/common/mock_zero_copy.hpp b/host/tests/common/mock_zero_copy.hpp
index 038a8e73d..9feb4e287 100644
--- a/host/tests/common/mock_zero_copy.hpp
+++ b/host/tests/common/mock_zero_copy.hpp
@@ -35,7 +35,7 @@ static constexpr size_t DEFAULT_RECV_FRAME_SIZE = 1024;
class mock_msb : public uhd::transport::managed_send_buffer
{
public:
- void release(void)
+ void release(void) override
{ /* nop */
}
@@ -53,7 +53,7 @@ private:
class mock_mrb : public uhd::transport::managed_recv_buffer
{
public:
- void release(void)
+ void release(void) override
{ /* nop */
}
@@ -76,22 +76,22 @@ public:
size_t recv_frame_size = DEFAULT_RECV_FRAME_SIZE,
size_t send_frame_size = DEFAULT_SEND_FRAME_SIZE);
- uhd::transport::managed_recv_buffer::sptr get_recv_buff(double);
- uhd::transport::managed_send_buffer::sptr get_send_buff(double);
+ uhd::transport::managed_recv_buffer::sptr get_recv_buff(double) override;
+ uhd::transport::managed_send_buffer::sptr get_send_buff(double) override;
- size_t get_num_recv_frames(void) const
+ size_t get_num_recv_frames(void) const override
{
return 1;
}
- size_t get_num_send_frames(void) const
+ size_t get_num_send_frames(void) const override
{
return 1;
}
- size_t get_recv_frame_size(void) const
+ size_t get_recv_frame_size(void) const override
{
return _recv_frame_size;
}
- size_t get_send_frame_size(void) const
+ size_t get_send_frame_size(void) const override
{
return _send_frame_size;
}
diff --git a/host/tests/constrained_device_args_test.cpp b/host/tests/constrained_device_args_test.cpp
index 2fe7e5c16..fc234ae01 100644
--- a/host/tests/constrained_device_args_test.cpp
+++ b/host/tests/constrained_device_args_test.cpp
@@ -48,14 +48,14 @@ public:
return _enum_arg.get();
}
- inline virtual std::string to_string() const
+ inline std::string to_string() const override
{
return _double_arg.to_string() + ", " + _size_t_arg.to_string() + ", "
+ _bool_arg.to_string() + ", " + _enum_arg.to_string();
}
private:
- virtual void _parse(const uhd::device_addr_t& dev_args)
+ void _parse(const uhd::device_addr_t& dev_args) override
{
if (dev_args.has_key(_double_arg.key()))
_double_arg.parse(dev_args[_double_arg.key()]);
diff --git a/host/tests/expert_test.cpp b/host/tests/expert_test.cpp
index 34be807ab..a23c9cbb8 100644
--- a/host/tests/expert_test.cpp
+++ b/host/tests/expert_test.cpp
@@ -27,7 +27,7 @@ public:
}
private:
- void resolve()
+ void resolve() override
{
_c = _a + _b;
}
@@ -51,7 +51,7 @@ public:
}
private:
- void resolve()
+ void resolve() override
{
_e.set(_c.get() * _d.get());
}
@@ -74,7 +74,7 @@ public:
}
private:
- void resolve()
+ void resolve() override
{
_f.set(-_b.get());
}
@@ -97,7 +97,7 @@ public:
}
private:
- void resolve()
+ void resolve() override
{
_g.set(_e.get() - _f.get());
}
@@ -120,7 +120,7 @@ public:
}
private:
- void resolve()
+ void resolve() override
{
*_output = _g;
}
@@ -137,7 +137,7 @@ public:
worker6_t() : worker_node_t("null_worker") {}
private:
- void resolve() {}
+ void resolve() override {}
};
//=============================================================================
diff --git a/host/tests/mb_controller_test.cpp b/host/tests/mb_controller_test.cpp
index b6fb49371..188dddecc 100644
--- a/host/tests/mb_controller_test.cpp
+++ b/host/tests/mb_controller_test.cpp
@@ -14,22 +14,22 @@ using namespace uhd::rfnoc;
class mock_timekeeper : public mb_controller::timekeeper
{
public:
- uint64_t get_ticks_now()
+ uint64_t get_ticks_now() override
{
return _ticks;
}
- uint64_t get_ticks_last_pps()
+ uint64_t get_ticks_last_pps() override
{
return _ticks;
}
- void set_ticks_now(const uint64_t ticks)
+ void set_ticks_now(const uint64_t ticks) override
{
_ticks = ticks;
}
- void set_ticks_next_pps(const uint64_t ticks)
+ void set_ticks_next_pps(const uint64_t ticks) override
{
_ticks = ticks;
}
@@ -43,7 +43,7 @@ public:
}
private:
- void set_period(const uint64_t period_ns)
+ void set_period(const uint64_t period_ns) override
{
_period = period_ns;
}
@@ -61,79 +61,79 @@ public:
/**************************************************************************
* Motherboard Control API (see mb_controller.hpp)
*************************************************************************/
- std::string get_mboard_name() const
+ std::string get_mboard_name() const override
{
return "MOCK-MB";
}
- void set_time_source(const std::string& source)
+ void set_time_source(const std::string& source) override
{
time_source = source;
}
- std::string get_time_source() const
+ std::string get_time_source() const override
{
return time_source;
}
- std::vector<std::string> get_time_sources() const
+ std::vector<std::string> get_time_sources() const override
{
return {"internal", "external"};
}
- void set_clock_source(const std::string& source)
+ void set_clock_source(const std::string& source) override
{
clock_source = source;
}
- std::string get_clock_source() const
+ std::string get_clock_source() const override
{
return clock_source;
}
- std::vector<std::string> get_clock_sources() const
+ std::vector<std::string> get_clock_sources() const override
{
return {"internal", "external"};
}
void set_sync_source(
- const std::string& /*clock_source*/, const std::string& /*time_source*/)
+ const std::string& /*clock_source*/, const std::string& /*time_source*/) override
{
}
- void set_sync_source(const device_addr_t& /*sync_source*/) {}
+ void set_sync_source(const device_addr_t& /*sync_source*/) override {}
- device_addr_t get_sync_source() const
+ device_addr_t get_sync_source() const override
{
return {};
}
- std::vector<device_addr_t> get_sync_sources()
+ std::vector<device_addr_t> get_sync_sources() override
{
return {};
}
- void set_clock_source_out(const bool enb)
+ void set_clock_source_out(const bool enb) override
{
clock_source_out = enb;
}
- void set_time_source_out(const bool enb)
+ void set_time_source_out(const bool enb) override
{
time_source_out = enb;
}
- sensor_value_t get_sensor(const std::string& /*name*/)
+ sensor_value_t get_sensor(const std::string& /*name*/) override
{
return sensor_value_t("Ref", false, "locked", "unlocked");
}
- std::vector<std::string> get_sensor_names()
+ std::vector<std::string> get_sensor_names() override
{
return {"mock_sensor"};
}
- uhd::usrp::mboard_eeprom_t get_eeprom()
+ uhd::usrp::mboard_eeprom_t get_eeprom() override
{
return {};
}
diff --git a/host/tests/offload_io_srv_test.cpp b/host/tests/offload_io_srv_test.cpp
index 806d4a3dc..c5ee20488 100644
--- a/host/tests/offload_io_srv_test.cpp
+++ b/host/tests/offload_io_srv_test.cpp
@@ -32,7 +32,7 @@ class mock_recv_io : public recv_io_if
public:
mock_recv_io(recv_link_if::sptr link) : _link(link) {}
- frame_buff::uptr get_recv_buff(int32_t timeout_ms)
+ frame_buff::uptr get_recv_buff(int32_t timeout_ms) override
{
if (_frames_allocated > 0) {
_frames_allocated--;
@@ -41,7 +41,7 @@ public:
return nullptr;
}
- void release_recv_buff(frame_buff::uptr buff)
+ void release_recv_buff(frame_buff::uptr buff) override
{
_link->release_recv_buff(std::move(buff));
}
@@ -71,17 +71,17 @@ class mock_send_io : public send_io_if
public:
mock_send_io(send_link_if::sptr link) : _link(link) {}
- frame_buff::uptr get_send_buff(int32_t timeout_ms)
+ frame_buff::uptr get_send_buff(int32_t timeout_ms) override
{
return _link->get_send_buff(timeout_ms);
}
- bool wait_for_dest_ready(size_t, int32_t)
+ bool wait_for_dest_ready(size_t, int32_t) override
{
return true;
}
- void release_send_buff(frame_buff::uptr buff)
+ void release_send_buff(frame_buff::uptr buff) override
{
_link->release_send_buff(std::move(buff));
}
@@ -103,10 +103,10 @@ private:
class mock_io_service : public io_service
{
public:
- void attach_recv_link(recv_link_if::sptr /*link*/) {}
- void attach_send_link(send_link_if::sptr /*link*/) {}
- void detach_recv_link(recv_link_if::sptr /*link*/) {}
- void detach_send_link(send_link_if::sptr /*link*/) {}
+ void attach_recv_link(recv_link_if::sptr /*link*/) override {}
+ void attach_send_link(send_link_if::sptr /*link*/) override {}
+ void detach_recv_link(recv_link_if::sptr /*link*/) override {}
+ void detach_send_link(send_link_if::sptr /*link*/) override {}
send_io_if::sptr make_send_client(send_link_if::sptr send_link,
size_t /*num_send_frames*/,
@@ -114,7 +114,7 @@ public:
recv_link_if::sptr /*recv_link*/,
size_t /*num_recv_frames*/,
recv_callback_t /*recv_cb*/,
- send_io_if::fc_callback_t /*fc_cb*/)
+ send_io_if::fc_callback_t /*fc_cb*/) override
{
return std::make_shared<mock_send_io>(send_link);
}
@@ -124,7 +124,7 @@ public:
recv_callback_t /*cb*/,
send_link_if::sptr /*fc_link*/,
size_t /*num_send_frames*/,
- recv_io_if::fc_callback_t /*fc_cb*/)
+ recv_io_if::fc_callback_t /*fc_cb*/) override
{
auto io = std::make_shared<mock_recv_io>(recv_link);
_recv_io.push_back(io);
diff --git a/host/tests/rfnoc_block_tests/fft_block_test.cpp b/host/tests/rfnoc_block_tests/fft_block_test.cpp
index 0eac8cf43..15e1de8f2 100644
--- a/host/tests/rfnoc_block_tests/fft_block_test.cpp
+++ b/host/tests/rfnoc_block_tests/fft_block_test.cpp
@@ -25,8 +25,10 @@ noc_block_base::make_args_t::~make_args_t() = default;
class fft_mock_reg_iface_t : public mock_reg_iface_t
{
public:
- virtual void _poke_cb(
- uint32_t addr, uint32_t /*data*/, uhd::time_spec_t /*time*/, bool /*ack*/)
+ void _poke_cb(uint32_t addr,
+ uint32_t /*data*/,
+ uhd::time_spec_t /*time*/,
+ bool /*ack*/) override
{
if (addr == fft_block_control::REG_RESET_ADDR) {
fft_was_reset = true;
diff --git a/host/tests/rfnoc_block_tests/fir_filter_block_test.cpp b/host/tests/rfnoc_block_tests/fir_filter_block_test.cpp
index 0ef725599..fe660b626 100644
--- a/host/tests/rfnoc_block_tests/fir_filter_block_test.cpp
+++ b/host/tests/rfnoc_block_tests/fir_filter_block_test.cpp
@@ -37,8 +37,8 @@ public:
{
}
- virtual void _poke_cb(
- uint32_t addr, uint32_t data, uhd::time_spec_t /*time*/, bool /*ack*/)
+ void _poke_cb(
+ uint32_t addr, uint32_t data, uhd::time_spec_t /*time*/, bool /*ack*/) override
{
if (addr == fir_filter_block_control::REG_FIR_MAX_NUM_COEFFS_ADDR) {
throw uhd::assertion_error("Invalid write to read-only register");
@@ -52,7 +52,7 @@ public:
}
}
- virtual void _peek_cb(uint32_t addr, uhd::time_spec_t /*time*/)
+ void _peek_cb(uint32_t addr, uhd::time_spec_t /*time*/) override
{
if (addr == fir_filter_block_control::REG_FIR_MAX_NUM_COEFFS_ADDR) {
read_memory[addr] = uhd::narrow_cast<int32_t>(_max_num_coeffs);
diff --git a/host/tests/rfnoc_block_tests/fosphor_block_test.cpp b/host/tests/rfnoc_block_tests/fosphor_block_test.cpp
index 0cdc678d2..fb3624e02 100644
--- a/host/tests/rfnoc_block_tests/fosphor_block_test.cpp
+++ b/host/tests/rfnoc_block_tests/fosphor_block_test.cpp
@@ -32,8 +32,8 @@ noc_block_base::make_args_t::~make_args_t() = default;
class fosphor_mock_reg_iface_t : public mock_reg_iface_t
{
public:
- virtual void _poke_cb(
- uint32_t addr, uint32_t data, uhd::time_spec_t /*time*/, bool /*ack*/)
+ void _poke_cb(
+ uint32_t addr, uint32_t data, uhd::time_spec_t /*time*/, bool /*ack*/) override
{
if (addr == fosphor_block_control::REG_ENABLE_ADDR) {
fosphor_enable_reg = data;
@@ -47,7 +47,7 @@ public:
}
}
- virtual void _peek_cb(uint32_t addr, uhd::time_spec_t /*time*/)
+ void _peek_cb(uint32_t addr, uhd::time_spec_t /*time*/) override
{
if (addr == fosphor_block_control::REG_ENABLE_ADDR) {
read_memory[addr] = fosphor_enable_reg;
diff --git a/host/tests/rfnoc_block_tests/keep_one_in_n_test.cpp b/host/tests/rfnoc_block_tests/keep_one_in_n_test.cpp
index 694ba7957..86c97db8f 100644
--- a/host/tests/rfnoc_block_tests/keep_one_in_n_test.cpp
+++ b/host/tests/rfnoc_block_tests/keep_one_in_n_test.cpp
@@ -29,7 +29,7 @@ public:
{
}
- virtual void _peek_cb(uint32_t addr, uhd::time_spec_t /*time*/)
+ void _peek_cb(uint32_t addr, uhd::time_spec_t /*time*/) override
{
// Emulate the read-only behavior of the WIDTH_N register
if (addr == keep_one_in_n_block_control::REG_WIDTH_N_OFFSET) {
diff --git a/host/tests/rfnoc_block_tests/siggen_block_test.cpp b/host/tests/rfnoc_block_tests/siggen_block_test.cpp
index 6fdcb903b..ea52530e0 100644
--- a/host/tests/rfnoc_block_tests/siggen_block_test.cpp
+++ b/host/tests/rfnoc_block_tests/siggen_block_test.cpp
@@ -44,8 +44,8 @@ public:
{
}
- virtual void _poke_cb(
- uint32_t addr, uint32_t data, uhd::time_spec_t /*time*/, bool /*ack*/)
+ void _poke_cb(
+ uint32_t addr, uint32_t data, uhd::time_spec_t /*time*/, bool /*ack*/) override
{
const size_t port = addr / siggen_block_control::REG_BLOCK_SIZE;
if (port >= _num_ports) {
@@ -72,7 +72,7 @@ public:
}
}
- virtual void _peek_cb(uint32_t addr, uhd::time_spec_t /*time*/)
+ void _peek_cb(uint32_t addr, uhd::time_spec_t /*time*/) override
{
const size_t port = addr / siggen_block_control::REG_BLOCK_SIZE;
if (port >= _num_ports) {
diff --git a/host/tests/rfnoc_block_tests/switchboard_block_test.cpp b/host/tests/rfnoc_block_tests/switchboard_block_test.cpp
index 693923693..3cc9fd147 100644
--- a/host/tests/rfnoc_block_tests/switchboard_block_test.cpp
+++ b/host/tests/rfnoc_block_tests/switchboard_block_test.cpp
@@ -41,8 +41,8 @@ public:
input_select.push_back(0);
}
- virtual void _poke_cb(
- uint32_t addr, uint32_t data, uhd::time_spec_t /*time*/, bool /*ack*/)
+ void _poke_cb(
+ uint32_t addr, uint32_t data, uhd::time_spec_t /*time*/, bool /*ack*/) override
{
size_t chan = addr / switchboard_block_control::REG_BLOCK_SIZE;
size_t offset = addr % switchboard_block_control::REG_BLOCK_SIZE;
@@ -55,7 +55,7 @@ public:
}
}
- virtual void _peek_cb(uint32_t addr, uhd::time_spec_t /*time*/)
+ void _peek_cb(uint32_t addr, uhd::time_spec_t /*time*/) override
{
size_t chan = addr / switchboard_block_control::REG_BLOCK_SIZE;
size_t offset = addr % switchboard_block_control::REG_BLOCK_SIZE;
diff --git a/host/tests/rfnoc_block_tests/vector_iir_block_test.cpp b/host/tests/rfnoc_block_tests/vector_iir_block_test.cpp
index 5fc1fd90e..8721d7bb5 100644
--- a/host/tests/rfnoc_block_tests/vector_iir_block_test.cpp
+++ b/host/tests/rfnoc_block_tests/vector_iir_block_test.cpp
@@ -44,8 +44,8 @@ public:
}
}
- virtual void _poke_cb(
- uint32_t addr, uint32_t data, uhd::time_spec_t /*time*/, bool /*ack*/)
+ void _poke_cb(
+ uint32_t addr, uint32_t data, uhd::time_spec_t /*time*/, bool /*ack*/) override
{
size_t chan = addr / vector_iir_block_control::REG_BLOCK_SIZE;
size_t offset = addr % vector_iir_block_control::REG_BLOCK_SIZE;
@@ -54,7 +54,7 @@ public:
}
}
- virtual void _peek_cb(uint32_t addr, uhd::time_spec_t /*time*/)
+ void _peek_cb(uint32_t addr, uhd::time_spec_t /*time*/) override
{
size_t chan = addr / vector_iir_block_control::REG_BLOCK_SIZE;
size_t offset = addr % vector_iir_block_control::REG_BLOCK_SIZE;
diff --git a/host/tests/rfnoc_block_tests/window_block_test.cpp b/host/tests/rfnoc_block_tests/window_block_test.cpp
index 65e493c4b..a8fcb5db0 100644
--- a/host/tests/rfnoc_block_tests/window_block_test.cpp
+++ b/host/tests/rfnoc_block_tests/window_block_test.cpp
@@ -42,8 +42,8 @@ public:
reset();
}
- virtual void _poke_cb(
- uint32_t addr, uint32_t data, uhd::time_spec_t /*time*/, bool /*ack*/)
+ void _poke_cb(
+ uint32_t addr, uint32_t data, uhd::time_spec_t /*time*/, bool /*ack*/) override
{
size_t chan = addr / window_block_control::REG_WINDOW_BLOCK_SIZE;
size_t offset = addr % window_block_control::REG_WINDOW_BLOCK_SIZE;
@@ -63,7 +63,7 @@ public:
}
}
- virtual void _peek_cb(uint32_t addr, uhd::time_spec_t /*time*/)
+ void _peek_cb(uint32_t addr, uhd::time_spec_t /*time*/) override
{
size_t chan = addr / window_block_control::REG_WINDOW_BLOCK_SIZE;
size_t offset = addr % window_block_control::REG_WINDOW_BLOCK_SIZE;
diff --git a/host/tests/rfnoc_graph_mock_nodes.hpp b/host/tests/rfnoc_graph_mock_nodes.hpp
index bfa08bea6..12bc5c38a 100644
--- a/host/tests/rfnoc_graph_mock_nodes.hpp
+++ b/host/tests/rfnoc_graph_mock_nodes.hpp
@@ -114,17 +114,17 @@ public:
set_action_forwarding_policy(policy);
}
- std::string get_unique_id() const
+ std::string get_unique_id() const override
{
return "MOCK_RADIO" + std::to_string(_radio_idx);
}
- size_t get_num_input_ports() const
+ size_t get_num_input_ports() const override
{
return 1;
}
- size_t get_num_output_ports() const
+ size_t get_num_output_ports() const override
{
return 1;
}
@@ -228,17 +228,17 @@ public:
});
}
- std::string get_unique_id() const
+ std::string get_unique_id() const override
{
return "MOCK_DDC";
}
- size_t get_num_input_ports() const
+ size_t get_num_input_ports() const override
{
return 1;
}
- size_t get_num_output_ports() const
+ size_t get_num_output_ports() const override
{
return 1;
}
@@ -281,17 +281,17 @@ public:
set_action_forwarding_policy(forwarding_policy_t::ONE_TO_ONE);
}
- std::string get_unique_id() const
+ std::string get_unique_id() const override
{
return "MOCK_FIFO";
}
- size_t get_num_input_ports() const
+ size_t get_num_input_ports() const override
{
return _num_ports;
}
- size_t get_num_output_ports() const
+ size_t get_num_output_ports() const override
{
return _num_ports;
}
@@ -324,17 +324,17 @@ public:
});
}
- std::string get_unique_id() const
+ std::string get_unique_id() const override
{
return "MOCK_STREAMER";
}
- size_t get_num_input_ports() const
+ size_t get_num_input_ports() const override
{
return _num_ports;
}
- size_t get_num_output_ports() const
+ size_t get_num_output_ports() const override
{
return _num_ports;
}
@@ -379,17 +379,17 @@ public:
}
}
- std::string get_unique_id() const
+ std::string get_unique_id() const override
{
return _name + std::to_string(_term_count);
}
- size_t get_num_input_ports() const
+ size_t get_num_input_ports() const override
{
return _num_ports;
}
- size_t get_num_output_ports() const
+ size_t get_num_output_ports() const override
{
return _num_ports;
}
@@ -483,17 +483,17 @@ public:
return node_t::get_property<T>(id, rsi);
}
- size_t get_num_input_ports() const
+ size_t get_num_input_ports() const override
{
return _input_ports;
}
- size_t get_num_output_ports() const
+ size_t get_num_output_ports() const override
{
return _output_ports;
}
- std::string get_unique_id() const
+ std::string get_unique_id() const override
{
return _name;
}
@@ -545,17 +545,17 @@ public:
set_action_forwarding_policy(forwarding_policy_t::DROP);
}
- size_t get_num_input_ports() const
+ size_t get_num_input_ports() const override
{
return _input_ports;
}
- size_t get_num_output_ports() const
+ size_t get_num_output_ports() const override
{
return _output_ports;
}
- std::string get_unique_id() const
+ std::string get_unique_id() const override
{
return "MOCK_ROUTING_NODE";
}
diff --git a/host/tests/rfnoc_node_test.cpp b/host/tests/rfnoc_node_test.cpp
index 283d0bf38..562c395e2 100644
--- a/host/tests/rfnoc_node_test.cpp
+++ b/host/tests/rfnoc_node_test.cpp
@@ -65,11 +65,11 @@ public:
{&_double_prop_user}, {&temp}, []() { std::cout << "foo" << std::endl; });
}
- size_t get_num_input_ports() const
+ size_t get_num_input_ports() const override
{
return _num_input_ports;
}
- size_t get_num_output_ports() const
+ size_t get_num_output_ports() const override
{
return _num_output_ports;
}
diff --git a/host/tests/rfnoc_propprop_test.cpp b/host/tests/rfnoc_propprop_test.cpp
index f07e9848e..d441d180a 100644
--- a/host/tests/rfnoc_propprop_test.cpp
+++ b/host/tests/rfnoc_propprop_test.cpp
@@ -29,17 +29,17 @@ public:
add_property_resolver({&_out}, {&_in}, [this]() { _in = _out / 2; });
}
- std::string get_unique_id() const
+ std::string get_unique_id() const override
{
return "MOCK_INVALID_NODE1";
}
- size_t get_num_input_ports() const
+ size_t get_num_input_ports() const override
{
return 1;
}
- size_t get_num_output_ports() const
+ size_t get_num_output_ports() const override
{
return 1;
}
@@ -88,17 +88,17 @@ public:
_in.set(old_val);
}
- size_t get_num_input_ports() const
+ size_t get_num_input_ports() const override
{
return 1;
}
- size_t get_num_output_ports() const
+ size_t get_num_output_ports() const override
{
return 1;
}
- std::string get_unique_id() const
+ std::string get_unique_id() const override
{
return "MOCK_INVALID_NODE2";
}
@@ -136,17 +136,17 @@ public:
});
}
- size_t get_num_input_ports() const
+ size_t get_num_input_ports() const override
{
return 1;
}
- size_t get_num_output_ports() const
+ size_t get_num_output_ports() const override
{
return 1;
}
- std::string get_unique_id() const
+ std::string get_unique_id() const override
{
return "MOCK_CIRCULAR_PROPS";
}
diff --git a/host/tests/rx_streamer_test.cpp b/host/tests/rx_streamer_test.cpp
index f50fef613..fdc010535 100644
--- a/host/tests/rx_streamer_test.cpp
+++ b/host/tests/rx_streamer_test.cpp
@@ -106,7 +106,7 @@ public:
{
}
- void issue_stream_cmd(const stream_cmd_t&) {}
+ void issue_stream_cmd(const stream_cmd_t&) override {}
void set_tick_rate(double rate)
{
diff --git a/host/tests/streamer_benchmark.cpp b/host/tests/streamer_benchmark.cpp
index 88dd9665b..bc427b29a 100644
--- a/host/tests/streamer_benchmark.cpp
+++ b/host/tests/streamer_benchmark.cpp
@@ -175,7 +175,7 @@ public:
rx_streamer_impl<xport, true>::set_scale_factor(chan, scale_factor);
}
- void issue_stream_cmd(const stream_cmd_t& /*stream_cmd*/) {}
+ void issue_stream_cmd(const stream_cmd_t& /*stream_cmd*/) override {}
};
/*!
@@ -206,7 +206,7 @@ public:
}
bool recv_async_msg(
- uhd::async_metadata_t& /*async_metadata*/, double /*timeout = 0.1*/)
+ uhd::async_metadata_t& /*async_metadata*/, double /*timeout = 0.1*/) override
{
return false;
}
diff --git a/host/tests/tx_streamer_test.cpp b/host/tests/tx_streamer_test.cpp
index 0016f596c..be89fa215 100644
--- a/host/tests/tx_streamer_test.cpp
+++ b/host/tests/tx_streamer_test.cpp
@@ -89,7 +89,7 @@ public:
}
bool recv_async_msg(
- uhd::async_metadata_t& /*async_metadata*/, double /*timeout = 0.1*/)
+ uhd::async_metadata_t& /*async_metadata*/, double /*timeout = 0.1*/) override
{
return false;
}