fix tests

- do not use pow(int, int)
- fix unify_pretty_function()
- replace typenames

diff --git a/tests/base/functions_12.cc b/tests/base/functions_12.cc
index 8cfbcf1f9e4c9389bfb34e2184289a9e1cbf5158..92b33a989db87c6a04089010b4bb4373212ab14f 100644 (file)
--- a/tests/base/functions_12.cc
+++ b/tests/base/functions_12.cc
@@ -32,7 +32,7 @@ void check()
 
   std::vector<double> coeffs(n_mon);
   for (unsigned int i = 0; i < n_mon; ++i)
-    coeffs[i] = std::pow(-1,i)*(i+1);
+    coeffs[i] = std::pow(-1.0,i)*(i+1);
 
   Functions::Polynomial<dim> poly(exponents, coeffs);
 

diff --git a/tests/base/number_traits_complex.cc b/tests/base/number_traits_complex.cc
index 61ee16f87548529afdc79869f11d6e5d7e6feceb..8119975055fb92aa0d7397479fd4bb3dea6e6413 100644 (file)
--- a/tests/base/number_traits_complex.cc
+++ b/tests/base/number_traits_complex.cc
@@ -23,11 +23,21 @@
 #include <limits>
 #include <typeinfo>
 
+// replace type names found on MAC OS
+std::string cleanup_type(std::string &in)
+{
+  std::string ret = in;
+  ret = Utilities::replace_in_string(ret, "NSt3__17complexIfEE", "St7complexIfE");
+  ret = Utilities::replace_in_string(ret, "NSt3__17complexIdEE", "St7complexIdE");
+  return ret;
+}
+
 
 template <typename number>
 void check (const number &x)
 {
-  deallog << "typeid(x).name() = " << typeid(x).name()
+  deallog << "typeid(x).name() = "
+          << cleanup_type(typeid(x).name())
           << std::endl;
 
   deallog << "typeid(NumberTraits<number>::real_type).name() = "

diff --git a/tests/tests.h b/tests/tests.h
index 5b3a6d46193eb59324195419caff80d6616d1269..ddbb10827925c071cc01b227608f4ac2bdfffcb8 100644 (file)
--- a/tests/tests.h
+++ b/tests/tests.h
@@ -145,8 +145,9 @@ void sort_file_contents (const std::string &filename)
 std::string unify_pretty_function (const std::string &text)
 {
   std::string t=text;
-  t=Utilities::replace_in_string(t, " &", "& ");
+  t=Utilities::replace_in_string(t, " &", " & ");
   t=Utilities::replace_in_string(t, " & ,", "&,");
+  t=Utilities::replace_in_string(t, " & )", "&)");
   t=Utilities::replace_in_string(t, " & ", "& ");
   t=Utilities::replace_in_string(t, "virtual ", "");
   return t;