[release] Fix pthread*test.

Add missing underscore in PTHREAD_CFLAGS.
Add missing returns in solver functions.

dune/istl/paamg/test/.gitignore

@@ -9,7 +9,12 @@ hierarchytest
 amgtest
 pamgtest
 pamg_comm_repart_test
+pthreadamgtest
+pthreadfastamgtest
+pthreadtwoleveltest
 transfertest
+twolevelmethodschwarztest
+twolevelmethodtest
 kamgtest
 fastamg
 

dune/istl/paamg/test/Makefile.am

@@ -126,18 +126,18 @@ twolevelmethodtest_LDADD =					\
 	$(LDADD)
 
 pthreadamgtest_SOURCES = pthreadamgtest.cc
-pthreadamgtest_CPPFLAGS = $(AM_CPPFLAGS) $(PTHREADCFLAGS) -DMYAMG="Dune::Amg::AMG<Operator,Vector,Smoother>"
-pthreadamgtest_LDFLAGS = $(AM_LDFLAGS) $(PTHREADCFLAGS)
+pthreadamgtest_CPPFLAGS = $(AM_CPPFLAGS) $(PTHREAD_CFLAGS) -DMYAMG="Dune::Amg::AMG<Operator,Vector,Smoother>"
+pthreadamgtest_LDFLAGS = $(AM_LDFLAGS) $(PTHREAD_CFLAGS)
 pthreadamgtest_LDADD = $(PTHREAD_LIBS) $(LDADD)
 
 pthreadfastamgtest_SOURCES = pthreadamgtest.cc
-pthreadfastamgtest_CPPFLAGS = $(AM_CPPFLAGS) $(PTHREADCFLAGS) -DMYAMG="Dune::Amg::FastAMG<Operator,Vector>"
-pthreadfastamgtest_LDFLAGS = $(AM_LDFLAGS) $(PTHREADCFLAGS)
+pthreadfastamgtest_CPPFLAGS = $(AM_CPPFLAGS) $(PTHREAD_CFLAGS) -DMYAMG="Dune::Amg::FastAMG<Operator,Vector>"
+pthreadfastamgtest_LDFLAGS = $(AM_LDFLAGS) $(PTHREAD_CFLAGS)
 pthreadfastamgtest_LDADD = $(PTHREAD_LIBS) $(LDADD)
 
 pthreadtwoleveltest_SOURCES = pthreadtwoleveltest.cc
-pthreadtwoleveltest_CPPFLAGS = $(AM_CPPFLAGS) $(PTHREADCFLAGS)
-pthreadtwoleveltest_LDFLAGS = $(AM_LDFLAGS) $(PTHREADCFLAGS)
+pthreadtwoleveltest_CPPFLAGS = $(AM_CPPFLAGS) $(PTHREAD_CFLAGS)
+pthreadtwoleveltest_LDFLAGS = $(AM_LDFLAGS) $(PTHREAD_CFLAGS)
 pthreadtwoleveltest_LDADD = $(PTHREAD_LIBS) $(LDADD)
 
 include $(top_srcdir)/am/global-rules

dune/istl/paamg/test/pthreadamgtest.cc

@@ -102,7 +102,7 @@ void *solve1(void* arg)
   *amgarg->x=0;
   (*amgarg->amg).apply(*amgarg->x,*amgarg->b);
   (*amgarg->amg).post(*amgarg->x);
-
+  return 0;
 }
 
 void *solve2(void* arg)
@@ -112,6 +112,7 @@ void *solve2(void* arg)
   (*amgarg->amg).pre(*amgarg->x,*amgarg->b);
   (*amgarg->amg).apply(*amgarg->x,*amgarg->b);
   (*amgarg->amg).post(*amgarg->x);
+  return 0;
 }
 
 template <int BS, typename AMG>