[fix] Pipeline and headers in tests

test/scdaq_config.cc

@@ -4,8 +4,8 @@
 #include <fstream>
 #include <future>
 
-#include "scdaq/config.h"
-#include "scdaq/exception.h"
+#include "config.h"
+#include "exception.h"
 
 namespace {
 
@@ -121,7 +121,7 @@ TEST(ConfigTest, LoadConfigurationPassthrough) {
   EXPECT_TRUE(cfg.getEnableStreamProcessor());
 
   // Output settings
-  EXPECT_STREQ(cfg.getOutputFilenameBase().c_str(), "test");
+  EXPECT_STREQ(cfg.getOutputFilenameBase().c_str(), "test/data");
   EXPECT_STREQ(cfg.getOutputFilenamePrefix().c_str(), "pass_gmt_1");
   EXPECT_EQ(cfg.getOutputMaxFileSize(), 8589934592);
   EXPECT_TRUE(cfg.getOutputForceWrite());

test/scdaq_operation.cc

@@ -6,22 +6,20 @@
 #include <stdexcept>
 #include <thread>
 
-#include "scdaq/config.h"
-#include "scdaq/exception.h"
-#include "scdaq/pipeline.h"
+#include "config.h"
+#include "exception.h"
+#include "pipeline.h"
+
+ctrl Pipeline::control;
 
 namespace {
 
 // Runs SCDAQ as configured by `cfg` for `secs` seconds before timing out.
 // Propagates any exceptions that occur before the timeout period elapses.
 int bounded_run(config &cfg, int secs) {
-  ctrl control{};
-  control.max_file_size = cfg.getOutputMaxFileSize();
-  control.packets_per_report = cfg.getPacketsPerReport();
-  control.output_force_write = cfg.getOutputForceWrite();
-  control.n_orbits_per_packet = cfg.getNOrbitsPerPacket();
-
-  auto pipeline = [&control, &cfg] { return run_pipeline(cfg.getNumThreads(), control, cfg); };
+  std::vector<config> vecConfigs = {cfg};
+  MultiPipeline p(vecConfigs);
+  auto pipeline = [&p] { return p.Run(); };
 
   std::packaged_task<int()> pipelineTask(pipeline);
   std::future<int> outcome = pipelineTask.get_future();
@@ -29,7 +27,7 @@ int bounded_run(config &cfg, int secs) {
   int timedOut = (outcome.wait_for(std::chrono::seconds(secs)) == std::future_status::timeout);
 
   if (timedOut) {
-    control.running = false;
+    Pipeline::control.running = false;
     th.detach();
   } else {
     th.join();