mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-12-14 12:10:34 +00:00
Code Issues Releases Wiki Activity

Fix test when std::filesystem is available

Browse Source
This commit is contained in:
Carles Fernandez 2019-06-12 20:52:40 +02:00
parent e3be903b3c
commit 46979c2197
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test_fpga.cc
View File

@ -47,7 +47,6 @@
#include "tracking_tests_flags.h" #include "tracking_tests_flags.h"
#include "tracking_true_obs_reader.h" #include "tracking_true_obs_reader.h"
#include <armadillo> #include <armadillo>
#include <boost/filesystem.hpp>
#include <gnuradio/blocks/file_source.h> #include <gnuradio/blocks/file_source.h>
#include <gnuradio/blocks/head.h> #include <gnuradio/blocks/head.h>
#include <gnuradio/blocks/interleaved_char_to_complex.h> #include <gnuradio/blocks/interleaved_char_to_complex.h>
@ -60,6 +59,14 @@
#include <utility> #include <utility>
#include <vector> #include <vector>
#if HAS_STD_FILESYSTEM
#include <filesystem>
namespace fs = std::filesystem;
#else
#include <boost/filesystem.hpp>
namespace fs = boost::filesystem;
#endif
// threads // threads
#include <fcntl.h> // for open, O_RDWR, O_SYNC #include <fcntl.h> // for open, O_RDWR, O_SYNC
#include <iostream> // for cout, endl #include <iostream> // for cout, endl
@ -1131,8 +1138,8 @@ TEST_F(TrackingPullInTestFpga, ValidationOfResults)
{ {
try try
{ {
boost::filesystem::path p(gnuplot_executable); fs::path p(gnuplot_executable);
boost::filesystem::path dir = p.parent_path(); fs::path dir = p.parent_path();
const std::string& gnuplot_path = dir.native(); const std::string& gnuplot_path = dir.native();
Gnuplot::set_GNUPlotPath(gnuplot_path); Gnuplot::set_GNUPlotPath(gnuplot_path);
auto decimate = static_cast<unsigned int>(FLAGS_plot_decimate); auto decimate = static_cast<unsigned int>(FLAGS_plot_decimate);