[hamradio-commits] [gnss-sdr] 246/303: Add new configuration option ENABLE_UNIT_TESTING_EXTRA
Carles Fernandez
carles_fernandez-guest at moszumanska.debian.org
Mon Feb 13 22:36:05 UTC 2017
This is an automated email from the git hooks/post-receive script.
carles_fernandez-guest pushed a commit to branch master
in repository gnss-sdr.
commit c11a20520e8d0c1fdea1115daf753f8111b2c50e
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date: Sat Jan 28 16:49:46 2017 +0100
Add new configuration option ENABLE_UNIT_TESTING_EXTRA
If set to ON, it donwload some raw signal files and add more tests to run_tests.
This allows a smaller source code tarball.
It defaults to OFF
---
CMakeLists.txt | 1 +
src/tests/CMakeLists.txt | 15 ++++++++++++++-
src/tests/data/gps_l2c_m_prn7_5msps.dat | Bin 8000000 -> 0 bytes
src/tests/test_main.cc | 10 +++++++---
.../gps_l1_ca_telemetry_decoder_test.cc | 3 ++-
.../tracking/gps_l1_ca_dll_pll_tracking_test.cc | 2 +-
6 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index bf4835f..4790143 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -68,6 +68,7 @@ endif(ENABLE_PACKAGING)
# Testing
option(ENABLE_UNIT_TESTING "Build unit tests" ON)
+option(ENABLE_UNIT_TESTING_EXTRA "Download external files and build extra unit tests" OFF)
option(ENABLE_SYSTEM_TESTING "Build system tests" OFF)
option(ENABLE_SYSTEM_TESTING_EXTRA "Download external tools and build extra system tests" OFF)
if(ENABLE_SYSTEM_TESTING_EXTRA)
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index 9d12519..ee54f45 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -188,7 +188,20 @@ if(ENABLE_SYSTEM_TESTING_EXTRA)
endif(ENABLE_SYSTEM_TESTING_EXTRA)
-add_definitions(-DTEST_PATH="${CMAKE_SOURCE_DIR}/src/tests/")
+if(ENABLE_UNIT_TESTING_EXTRA)
+ add_definitions(-DEXTRA_TESTS)
+ if(NOT EXISTS ${CMAKE_SOURCE_DIR}/thirdparty/signal_samples/gps_l2c_m_prn7_5msps.dat)
+ message(STATUS "Downloading some data files for testing...")
+ file(DOWNLOAD https://sourceforge.net/projects/gnss-sdr/files/data/gps_l2c_m_prn7_5msps.dat ${CMAKE_CURRENT_SOURCE_DIR}/../../thirdparty/signal_samples/gps_l2c_m_prn7_5msps.dat
+ SHOW_PROGRESS
+ EXPECTED_HASH MD5=a6fcbefe155137945d3c33c5ef7bd0f9 )
+ endif(NOT EXISTS ${CMAKE_SOURCE_DIR}/thirdparty/signal_samples/gps_l2c_m_prn7_5msps.dat)
+endif(ENABLE_UNIT_TESTING_EXTRA)
+file(COPY ${CMAKE_SOURCE_DIR}/src/tests/signal_samples/GSoC_CTTC_capture_2012_07_26_4Msps_4ms.dat DESTINATION ${CMAKE_SOURCE_DIR}/thirdparty/signal_samples)
+file(COPY ${CMAKE_SOURCE_DIR}/src/tests/signal_samples/Galileo_E1_ID_1_Fs_4Msps_8ms.dat DESTINATION ${CMAKE_SOURCE_DIR}/thirdparty/signal_samples)
+file(COPY ${CMAKE_SOURCE_DIR}/src/tests/signal_samples/GPS_L1_CA_ID_1_Fs_4Msps_2ms.dat DESTINATION ${CMAKE_SOURCE_DIR}/thirdparty/signal_samples)
+
+add_definitions(-DTEST_PATH="${CMAKE_SOURCE_DIR}/thirdparty/")
include_directories(
${GTEST_INCLUDE_DIRECTORIES}
diff --git a/src/tests/data/gps_l2c_m_prn7_5msps.dat b/src/tests/data/gps_l2c_m_prn7_5msps.dat
deleted file mode 100644
index 9dbab62..0000000
Binary files a/src/tests/data/gps_l2c_m_prn7_5msps.dat and /dev/null differ
diff --git a/src/tests/test_main.cc b/src/tests/test_main.cc
index c0c4123..afb0006 100644
--- a/src/tests/test_main.cc
+++ b/src/tests/test_main.cc
@@ -114,18 +114,22 @@ DECLARE_string(log_dir);
#include "unit-tests/signal-processing-blocks/tracking/galileo_e1_dll_pll_veml_tracking_test.cc"
#include "unit-tests/signal-processing-blocks/tracking/galileo_e5a_tracking_test.cc"
#include "unit-tests/signal-processing-blocks/tracking/gps_l2_m_dll_pll_tracking_test.cc"
-#include "unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test.cc"
-#include "unit-tests/signal-processing-blocks/telemetry_decoder/gps_l1_ca_telemetry_decoder_test.cc"
#include "unit-tests/signal-processing-blocks/tracking/tracking_loop_filter_test.cc"
#include "unit-tests/signal-processing-blocks/tracking/cpu_multicorrelator_test.cc"
+
#if CUDA_BLOCKS_TEST
- #include "unit-tests/signal-processing-blocks/tracking/gpu_multicorrelator_test.cc"
+#include "unit-tests/signal-processing-blocks/tracking/gpu_multicorrelator_test.cc"
#endif
#include "unit-tests/signal-processing-blocks/pvt/rtcm_test.cc"
#include "unit-tests/signal-processing-blocks/pvt/rtcm_printer_test.cc"
#include "unit-tests/signal-processing-blocks/pvt/rinex_printer_test.cc"
+#if EXTRA_TESTS
+#include "unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test.cc"
+#include "unit-tests/signal-processing-blocks/telemetry_decoder/gps_l1_ca_telemetry_decoder_test.cc"
+#endif
+
// For GPS NAVIGATION (L1)
concurrent_queue<Gps_Acq_Assist> global_gps_acq_assist_queue;
concurrent_map<Gps_Acq_Assist> global_gps_acq_assist_map;
diff --git a/src/tests/unit-tests/signal-processing-blocks/telemetry_decoder/gps_l1_ca_telemetry_decoder_test.cc b/src/tests/unit-tests/signal-processing-blocks/telemetry_decoder/gps_l1_ca_telemetry_decoder_test.cc
index 79c624b..2660887 100644
--- a/src/tests/unit-tests/signal-processing-blocks/telemetry_decoder/gps_l1_ca_telemetry_decoder_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/telemetry_decoder/gps_l1_ca_telemetry_decoder_test.cc
@@ -50,6 +50,7 @@
#include "gnss_sdr_valve.h"
#include "gnss_synchro.h"
#include "gps_l1_ca_telemetry_decoder.h"
+#include "gps_l1_ca_dll_pll_tracking.h"
// ######## GNURADIO BLOCK MESSAGE RECEVER FOR TRACKING MESSAGES #########
class GpsL1CADllPllTelemetryDecoderTest_msg_rx;
@@ -244,7 +245,7 @@ TEST_F(GpsL1CATelemetryDecoderTest, ValidationOfResults)
ASSERT_NO_THROW( {
std::string path = std::string(TEST_PATH);
- std::string file = path + "data/gps_l1ca_prn1_2.6msps.dat";
+ std::string file = path + "signal_samples/gps_l1ca_prn1_2.6msps.dat";
const char * file_name = file.c_str();
gr::blocks::file_source::sptr file_source = gr::blocks::file_source::make(sizeof(int8_t), file_name, false);
//boost::shared_ptr<gr::block> valve = gnss_sdr_make_valve(sizeof(gr_complex), nsamples, queue);
diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test.cc
index bc95052..af0ccfb 100644
--- a/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test.cc
@@ -181,7 +181,7 @@ TEST_F(GpsL1CADllPllTrackingTest, ValidationOfResults)
ASSERT_NO_THROW( {
std::string path = std::string(TEST_PATH);
- std::string file = path + "data/gps_l1ca_prn1_2.6msps.dat";
+ std::string file = path + "signal_samples/gps_l1ca_prn1_2.6msps.dat";
const char * file_name = file.c_str();
gr::blocks::file_source::sptr file_source = gr::blocks::file_source::make(sizeof(int8_t), file_name, false);
//boost::shared_ptr<gr::block> valve = gnss_sdr_make_valve(sizeof(gr_complex), nsamples, queue);
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/gnss-sdr.git
More information about the pkg-hamradio-commits
mailing list