From a37004e022f02d0f31777b64210137e37d13079a Mon Sep 17 00:00:00 2001
From: Jonathan Hanks <jonathan.hanks@ligo.org>
Date: Thu, 5 Nov 2020 15:39:06 -0800
Subject: [PATCH] Removing some C++14isms from test code and a typo from DV.
Dataviewer had a spurious character after an include. That was removed.
Removed some C++14isms in the cps_recv test code.
---
src/dv/Control/main.c | 2 +-
src/pub_sub_stream/tests/test_dc_stats.cc | 42 +++++++++++------------
2 files changed, 21 insertions(+), 23 deletions(-)
diff --git a/src/dv/Control/main.c b/src/dv/Control/main.c
index 28844c0e1..194e85687 100644
--- a/src/dv/Control/main.c
+++ b/src/dv/Control/main.c
@@ -35,7 +35,7 @@
#include <unistd.h>
#include <sys/types.h>
-#include <sys/wait.h>q
+#include <sys/wait.h>
/* Action Table */
diff --git a/src/pub_sub_stream/tests/test_dc_stats.cc b/src/pub_sub_stream/tests/test_dc_stats.cc
index c775f0dc3..8f1b3138f 100644
--- a/src/pub_sub_stream/tests/test_dc_stats.cc
+++ b/src/pub_sub_stream/tests/test_dc_stats.cc
@@ -16,31 +16,29 @@
namespace
{
+ DCUStats
+ make_stats( int config_crc,
+ unsigned int status,
+ int crc_per_sec,
+ int crc_sum,
+ std::string model_name )
+ {
+ DCUStats d;
+ d.expected_config_crc = config_crc;
+ d.status = status;
+ d.crc_per_sec = crc_per_sec;
+ d.crc_sum = crc_sum;
+ d.full_model_name = std::move( model_name );
+ return d;
+ }
+
std::vector< DCUStats >
basic_dcus( )
{
std::vector< DCUStats > dcus;
- dcus.emplace_back( DCUStats{
- 0,
- 0,
- 0,
- 0,
- "mod0",
- } );
- dcus.emplace_back( DCUStats{
- 1,
- 0,
- 0,
- 0,
- "mod1",
- } );
- dcus.emplace_back( DCUStats{
- 2,
- 0,
- 0,
- 0,
- "mod2",
- } );
+ dcus.emplace_back( make_stats( 0, 0, 0, 0, "mod0" ) );
+ dcus.emplace_back( make_stats( 1, 0, 0, 0, "mod1" ) );
+ dcus.emplace_back( make_stats( 2, 0, 0, 0, "mod2" ) );
return dcus;
}
@@ -237,4 +235,4 @@ TEST_CASE( "CRCs are cleared at the second boundary" )
dc_stats.stop( );
th.join( );
-}
\ No newline at end of file
+}
--
GitLab