From 3bfc3f3e43731a342c49afb6d7574bc4a7e4895b Mon Sep 17 00:00:00 2001
From: Daniel Arndt <daniel.arndt@iwr.uni-heidelberg.de>
Date: Wed, 9 Aug 2017 02:14:30 +0200
Subject: [PATCH] Fix creating coverage information

---
 cmake/setup_compiler_flags_gnu.cmake      |  4 ++--
 doc/developers/testsuite.html             | 10 ++++++++++
 doc/news/changes/minor/20170809MaierArndt |  5 +++++
 3 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 doc/news/changes/minor/20170809MaierArndt

diff --git a/cmake/setup_compiler_flags_gnu.cmake b/cmake/setup_compiler_flags_gnu.cmake
index 96ab6ae1fe..04a3761c22 100644
--- a/cmake/setup_compiler_flags_gnu.cmake
+++ b/cmake/setup_compiler_flags_gnu.cmake
@@ -188,8 +188,8 @@ IF (CMAKE_BUILD_TYPE MATCHES "Debug")
     # Enable test coverage
     #
     ENABLE_IF_SUPPORTED(DEAL_II_CXX_FLAGS_DEBUG "-fno-elide-constructors")
-    ENABLE_IF_SUPPORTED(DEAL_II_CXX_FLAGS_DEBUG "-ftest-coverage -fprofile-arcs")
-    ENABLE_IF_SUPPORTED(DEAL_II_LINKER_FLAGS_DEBUG "-ftest-coverage -fprofile-arcs")
+    ADD_FLAGS(DEAL_II_CXX_FLAGS_DEBUG "-ftest-coverage -fprofile-arcs")
+    ADD_FLAGS(DEAL_II_LINKER_FLAGS_DEBUG "-ftest-coverage -fprofile-arcs")
   ENDIF()
 
 ENDIF()
diff --git a/doc/developers/testsuite.html b/doc/developers/testsuite.html
index 0e97cdf5af..6b18642dfc 100644
--- a/doc/developers/testsuite.html
+++ b/doc/developers/testsuite.html
@@ -727,6 +727,16 @@ $ ctest [...] -V -S ../tests/run_testsuite.cmake
       specify the same options for <code>ctest</code> as explained above.
     </p>
 
+    <p>
+      <b>Note:</b>
+      For also building the tests in parallel you have to provide suitable flags
+      using MAKEOPTS as well, i.e. you would typically use
+<pre>
+$ ctest -DMAKEOPTS="-j N" -j N [...] -V -S ../tests/run_testsuite.cmake
+</pre>
+      for compiling the library and running the tests in parallel.
+    </p>
+
     <p>
       It is possible to run tests and submit results for an already installed library by
 <pre>
diff --git a/doc/news/changes/minor/20170809MaierArndt b/doc/news/changes/minor/20170809MaierArndt
new file mode 100644
index 0000000000..c30541a51d
--- /dev/null
+++ b/doc/news/changes/minor/20170809MaierArndt
@@ -0,0 +1,5 @@
+Fixed: Creation of coverage information via 
+compiling with 'DEAL_II_SETUP_COVERAGE=ON'
+and 'ctest -S ../tests/run_coverage.cmake' works again.
+<br>
+(Matthias Maier, Daniel Arndt, 2017/08/09)
-- 
2.39.5