Return-Path: X-Original-To: apmail-hawq-commits-archive@minotaur.apache.org Delivered-To: apmail-hawq-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id DC1A119532 for ; Sun, 10 Apr 2016 07:10:16 +0000 (UTC) Received: (qmail 38965 invoked by uid 500); 10 Apr 2016 07:10:16 -0000 Delivered-To: apmail-hawq-commits-archive@hawq.apache.org Received: (qmail 38921 invoked by uid 500); 10 Apr 2016 07:10:16 -0000 Mailing-List: contact commits-help@hawq.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hawq.incubator.apache.org Delivered-To: mailing list commits@hawq.incubator.apache.org Received: (qmail 38910 invoked by uid 99); 10 Apr 2016 07:10:16 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 10 Apr 2016 07:10:16 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id D59EB180222 for ; Sun, 10 Apr 2016 07:10:15 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -3.221 X-Spam-Level: X-Spam-Status: No, score=-3.221 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.001] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id E2vsR1lJpgOz for ; Sun, 10 Apr 2016 07:10:15 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id 288A95F232 for ; Sun, 10 Apr 2016 07:10:13 +0000 (UTC) Received: (qmail 38907 invoked by uid 99); 10 Apr 2016 07:10:13 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 10 Apr 2016 07:10:13 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id F293ADFE2E; Sun, 10 Apr 2016 07:10:12 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: lei_chang@apache.org To: commits@hawq.incubator.apache.org Message-Id: <64592f176cdb416f85ef78266ee3aa91@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: incubator-hawq git commit: HAWQ-653. fix the bug when enabling code coverage Date: Sun, 10 Apr 2016 07:10:12 +0000 (UTC) Repository: incubator-hawq Updated Branches: refs/heads/master 434b93170 -> 079c499dd HAWQ-653. fix the bug when enabling code coverage Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/079c499d Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/079c499d Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/079c499d Branch: refs/heads/master Commit: 079c499dd22d965a164eb340bdb286b313092e44 Parents: 434b931 Author: Lei Chang Authored: Sun Apr 10 13:55:38 2016 +0800 Committer: Lei Chang Committed: Sun Apr 10 14:55:01 2016 +0800 ---------------------------------------------------------------------- depends/libyarn/CMake/CodeCoverage.cmake | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/079c499d/depends/libyarn/CMake/CodeCoverage.cmake ---------------------------------------------------------------------- diff --git a/depends/libyarn/CMake/CodeCoverage.cmake b/depends/libyarn/CMake/CodeCoverage.cmake index 48debed..226ae83 100644 --- a/depends/libyarn/CMake/CodeCoverage.cmake +++ b/depends/libyarn/CMake/CodeCoverage.cmake @@ -18,11 +18,7 @@ # Check prereqs FIND_PROGRAM(GCOV_PATH gcov) - -IF(CMAKE_COMPILER_IS_GNUCXX) - FIND_PROGRAM(LCOV_PATH lcov) -ENDIF(CMAKE_COMPILER_IS_GNUCXX) - +FIND_PROGRAM(LCOV_PATH lcov) FIND_PROGRAM(GENHTML_PATH genhtml) IF(NOT GCOV_PATH) @@ -35,12 +31,8 @@ ENDIF(NOT CMAKE_BUILD_TYPE STREQUAL Debug) #Setup compiler options ADD_DEFINITIONS(-fprofile-arcs -ftest-coverage) - -IF(CMAKE_COMPILER_IS_GNUCXX) - LINK_LIBRARIES(gcov) -ELSEIF(CMAKE_COMPILER_IS_CLANG) - LINK_LIBRARIES(profile_rt) -ENDIF(CMAKE_COMPILER_IS_GNUCXX) +SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fprofile-arcs ") +SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fprofile-arcs ") IF((NOT LCOV_PATH) AND CMAKE_COMPILER_IS_GNUCXX) MESSAGE(FATAL_ERROR "lcov not found! Aborting...")