Merge remote-tracking branch 'tobias/master'

Conflicts:
	dune/stuff/test/common_logger.cc

dune/stuff/test/common_configuration.cc

@@ -125,9 +125,10 @@ struct ConfigTest : public testing::Test
   static const int count = 2;
   DefaultRNG<T> rng;
   RandomStrings key_gen;
-  // std::array is not assignable from list_of it seems
-  const boost::array<T, count> values;
-  const boost::array<std::string, count> keys;
+  // std::array is not assignable from list_of it seems. Don't make the following two arrays const (triggers boost/intel
+  // compiler bug, last tested with icpc version 14.0.3).
+  boost::array<T, count> values;
+  boost::array<std::string, count> keys;
   ConfigTest()
     : key_gen(8)
     , values(boost::assign::list_of<T>().repeat_fun(values.size() - 1, rng))

dune/stuff/test/common_logger.cc

@@ -3,10 +3,9 @@
 // Copyright holders: Rene Milk, Felix Schindler
 // License: BSD 2-Clause License (http://opensource.org/licenses/BSD-2-Clause)
 
-#include "config.h"
+#include "main.hxx"
 
-#include <dune/stuff/test/gtest/gtest.h>
-#include <dune/stuff/test/common.hh>
+// dune-stuff
 #include <dune/stuff/common/logging.hh>
 #include <dune/stuff/common/logstreams.hh>
 
@@ -29,10 +28,8 @@ void do_something_that_takes_long(std::ostream& out)
   out << std::endl;
 } // void do_something_that_takes_long()
 
-int main(int argc, char** argv)
+TEST(LoggerTest, all)
 {
-  testing::InitGoogleTest(&argc, argv);
-
   DSC::Logger().create(DSC::LOG_CONSOLE | DSC::LOG_ERROR);
   DSC::Logger().error() << "This should be in output\n";
   DSC::Logger().info() << "This should NOT be in output\n";
@@ -61,6 +58,4 @@ int main(int argc, char** argv)
   std::cout << "begin Logger().error() test" << std::endl;
   do_something_that_takes_long(err);
   std::cout << "end   Logger().error() test" << std::endl;
-
-  return 0;
 }

dune/stuff/test/common_string.cc

@@ -162,11 +162,13 @@ TEST(StringTest, ConvertFrom)
 // Hex, whitespacify, tokenize, stringFromTime tests
 TEST(StringTest, Hex)
 {
+// disabled the following test for Intel compiler because it causes compilation failures for no obvious reason
+#ifndef __INTEL_COMPILER
   EXPECT_GT(boost::lexical_cast<HexToString<unsigned long>>(cout), 0u);
+#endif
   EXPECT_EQ(boost::lexical_cast<HexToString<unsigned long>>("0x00000F"), 15u);
 }
 
-
 TEST(StringTest, Whitespace)
 {
   EXPECT_EQ("---------", whitespaceify("\t\t\t\t\t\t\t\t\t", '-'));