[hamradio-commits] [gnss-sdr] 94/303: Fix crash

[Carles Fernandez]

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 001896fbd76eb1e50226dab33499e27fcd30d5a0
Author: Carles Fernandez <carlesfernandez at gmail.com>
Date:   Mon Oct 10 11:19:58 2016 +0200

    Fix crash
---
 src/tests/system-tests/ttff_gps_l1.cc | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/tests/system-tests/ttff_gps_l1.cc b/src/tests/system-tests/ttff_gps_l1.cc
index 80807aa..86d6c83 100644
--- a/src/tests/system-tests/ttff_gps_l1.cc
+++ b/src/tests/system-tests/ttff_gps_l1.cc
@@ -238,10 +238,17 @@ void TTFF_GPS_L1_CA_Test::config_1()
 
 void TTFF_GPS_L1_CA_Test::config_2()
 {
-    //std::string path = std::string(TEST_PATH);
-    //std::string filename = path + "../../conf/gnss-sdr_GPS_L1_USRP_X300_realtime.conf";
-    config2 = std::make_shared<FileConfiguration>(FLAGS_config_file_ttff);
-    config2->set_property("SignalSource.samples", std::to_string(FLAGS_fs_in * FLAGS_max_measurement_duration));
+   if(FLAGS_config_file_ttff.empty())
+     {
+        std::string path = std::string(TEST_PATH);
+        std::string filename = path + "../../conf/gnss-sdr_GPS_L1_USRP_X300_realtime.conf";
+        config2 = std::make_shared<FileConfiguration>(filename);
+     }
+   else
+     {
+        config2 = std::make_shared<FileConfiguration>(FLAGS_config_file_ttff);
+     }
+   config2->set_property("SignalSource.samples", std::to_string(FLAGS_fs_in * FLAGS_max_measurement_duration));
 }
 
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/gnss-sdr.git