[hamradio-commits] [gnss-sdr] 176/251: Merge branch 'next' of git+ssh://github.com/gnss-sdr/gnss-sdr into next

[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 48b010c15f0ce469c0717198786395b3a55bde3e
Merge: edb636c 7a4ecf3
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Fri Jun 12 17:58:50 2015 +0200

    Merge branch 'next' of git+ssh://github.com/gnss-sdr/gnss-sdr into next
    
    # Please enter a commit message to explain why this merge is necessary,
    # especially if it merges an updated upstream into a topic branch.
    #
    # Lines starting with '#' will be ignored, and an empty message aborts
    # the commit.

 conf/gnss-sdr_GPS_L2C_USRP_X300_realtime.conf      |  18 +-
 ...channel_GPS_L2_M_Flexiband_bin_file_III_1b.conf | 186 +++++++++------------
 .../adapters/gps_l2_m_pcps_acquisition.cc          |   2 +
 .../gps_l2_m_telemetry_decoder_cc.cc               |   2 +-
 .../telemetry_decoder/libs/viterbi_decoder.cc      |  47 +++++-
 .../telemetry_decoder/libs/viterbi_decoder.h       |   1 +
 .../gps_l2_m_dll_pll_tracking_cc.cc                |  24 +--
 src/tests/test_main.cc                             |  10 +-
 8 files changed, 152 insertions(+), 138 deletions(-)

diff --cc src/tests/test_main.cc
index 714955a,714955a..31daaa6
--- a/src/tests/test_main.cc
+++ b/src/tests/test_main.cc
@@@ -161,16 -161,16 +161,18 @@@ concurrent_map<Sbas_Ephemeris> global_s
  int main(int argc, char **argv)
  {
      std::cout << "Running GNSS-SDR Tests..." << std::endl;
++    int res = 0;
++    testing::InitGoogleTest(&argc, argv);
++    google::ParseCommandLineFlags(&argc, &argv, true);
++    google::InitGoogleLogging(argv[0]);
      try
      {
--            testing::InitGoogleTest(&argc, argv);
--            google::ParseCommandLineFlags(&argc, &argv, true);
--            google::InitGoogleLogging(argv[0]);
--            return RUN_ALL_TESTS();
++            res = RUN_ALL_TESTS();
      }
      catch(...)
      {
              LOG(WARNING) << "Unexpected catch";
      }
      google::ShutDownCommandLineFlags();
++    return res;
  }

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