commit d035ab3bba9eb8038b300172eeb3c9842ad63bfe
author David Benjamin <davidben@google.com> Tue Dec 27 12:15:56 2016 -0500
committer CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> Tue Jan 03 13:17:57 2017 +0000
tree 066bd4fcdca43c3cf4b30b0e28b0beeff168a68c
parent f650c71ac056cf37db95f39b65d4d2fb5ee3d72d

Add a GCOV option to CMakeLists.txt.

Get us a little closer to productionizing the coverage generation, which
will require taking all the logic out of the coverage script.

Change-Id: If410cc198a888ee87a84b1c2d532322682d3c44e
Reviewed-on: https://boringssl-review.googlesource.com/13043
Reviewed-by: Steven Valdez <svaldez@google.com>
Reviewed-by: David Benjamin <davidben@google.com>
Commit-Queue: David Benjamin <davidben@google.com>
CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>

CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c3b697f..b194160 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -218,6 +218,11 @@
   set(OPENSSL_NO_ASM "1")
 endif()
 
+if (GCOV)
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fprofile-arcs -ftest-coverage")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fprofile-arcs -ftest-coverage")
+endif()
+
 if (OPENSSL_NO_ASM)
   add_definitions(-DOPENSSL_NO_ASM)
   set(ARCH "generic")

util/generate-coverage.sh

diff --git a/util/generate-coverage.sh b/util/generate-coverage.sh
index edd2edb..e16a9a4 100755
--- a/util/generate-coverage.sh
+++ b/util/generate-coverage.sh
@@ -27,8 +27,7 @@
 fi
 
 cd "$BUILD"
-cmake "$SRC" -GNinja -DCMAKE_C_FLAGS='-fprofile-arcs -ftest-coverage' \
-  -DCMAKE_CXX_FLAGS='-fprofile-arcs -ftest-coverage'
+cmake "$SRC" -GNinja -DGCOV=1
 ninja
 
 cp -r "$SRC/crypto" "$SRC/decrepit" "$SRC/include" "$SRC/ssl" "$SRC/tool" \