From 0a1e1e88c146e687cb44d989b2f120e2c2deaaa4 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Thu, 30 Nov 2017 21:48:57 +0100
Subject: [PATCH] Minor fixes

---
 src/tests/common-files/gnuplot_i.h | 2 --
 src/tests/test_main.cc             | 2 --
 2 files changed, 4 deletions(-)

diff --git a/src/tests/common-files/gnuplot_i.h b/src/tests/common-files/gnuplot_i.h
index 3e9b966c6..0996924d2 100644
--- a/src/tests/common-files/gnuplot_i.h
+++ b/src/tests/common-files/gnuplot_i.h
@@ -1890,7 +1890,6 @@ bool Gnuplot::get_program_path()
     if (path == NULL)
         {
             throw GnuplotException("Path is not set");
-            return false;
         }
     else
         {
@@ -2036,7 +2035,6 @@ std::string Gnuplot::create_tmpfile(std::ofstream &tmp)
                 std::ostringstream except;
                 except << "Cannot create temporary file \"" << name << "\"";
                 throw GnuplotException(except.str());
-                return "";
             }
 
     tmp.open(name);
diff --git a/src/tests/test_main.cc b/src/tests/test_main.cc
index ce8de7097..efb2ee422 100644
--- a/src/tests/test_main.cc
+++ b/src/tests/test_main.cc
@@ -70,9 +70,7 @@ DECLARE_string(log_dir);
 #include "unit-tests/arithmetic/code_generation_test.cc"
 #include "unit-tests/arithmetic/fft_length_test.cc"
 #include "unit-tests/arithmetic/fft_speed_test.cc"
-#if MATIO_TEST
 #include "unit-tests/arithmetic/matio_test.cc"
-#endif
 
 #include "unit-tests/control-plane/file_configuration_test.cc"
 #include "unit-tests/control-plane/in_memory_configuration_test.cc"