From patchwork Fri Jun 12 02:24:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oliver O'Halloran X-Patchwork-Id: 1307961 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49jl6D0r7yz9sRN for ; Fri, 12 Jun 2020 12:29:08 +1000 (AEST) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=Gn34/10t; dkim-atps=neutral Received: from bilbo.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 49jl6C6c4YzDqty for ; Fri, 12 Jun 2020 12:29:07 +1000 (AEST) X-Original-To: skiboot@lists.ozlabs.org Delivered-To: skiboot@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gmail.com (client-ip=2a00:1450:4864:20::443; helo=mail-wr1-x443.google.com; envelope-from=oohall@gmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=Gn34/10t; dkim-atps=neutral Received: from mail-wr1-x443.google.com (mail-wr1-x443.google.com [IPv6:2a00:1450:4864:20::443]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 49jl2C145vzDqsw for ; Fri, 12 Jun 2020 12:25:38 +1000 (AEST) Received: by mail-wr1-x443.google.com with SMTP id x14so8161517wrp.2 for ; Thu, 11 Jun 2020 19:25:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=X/8hRSoLawQD72WGkcHXmGaX3QY1vJgnG5Ta1KRsE3g=; b=Gn34/10t6L1wtaRk87A8fP1bu05kBy3G4ju3Dm22ok7bX613FUEGCgs8g+d86P4Ach iUhbGykVyzBWkB+h75buEblddAqB2lknV2l4SQHZyo1s+AvkQ2BpuFLzWzDgV0CREdBj yGopDmWdrM8chbyTYE3nZRX8cMRp4HKfZ/x8lU/wM730voz8Ezu5747LWRYMBxNrjUrH TtozD/EMw3WZUVfQg3nTqfOvmIdy1KR5Kg9yaskNWFHR44PuftEaat1EtHOGTEr4Hwix E3EhI43pPGxWGk9mXMzEuURmDmVy7eyWTmKLVME5VHIiZiHVh4mAcLp24By3x2lhUOyu Okug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=X/8hRSoLawQD72WGkcHXmGaX3QY1vJgnG5Ta1KRsE3g=; b=acFK3ogDTPYc+Wv77Hr8/s9E+ExleGyqMVA988Lxm4lj0H1/7stZIB5yQM1ocnCBdH pJdLazTK0bNUnM6UWGFF7hxKW/PaIp5l3Ao5XtK3wW9QYWIMy9QcRPf3CaBcyargRESq 26hzqOrJ33rhB1uyB7zEq5qOa38odsdtUtwgvK/kAvWiWiAOXKGM0Fvrfmst52luFujg gGzU+XFAXp0IRmd9UZXz0rz7pSSiqv0RNPuiMLibaIS1c8Jl0HZrxUkAw4QJ9OZEz4sk 6+h5csVPc1/Gt/EuSKu+FYuDMrMwiCo2InARc9e/0ZZnC9YH6c/ceCLFJ8vJQlp3h6OY V8dw== X-Gm-Message-State: AOAM532w5CFEIPsD9OFGTIQooaxysFNpS/ypCtNWm/sm+t60Hr82JhyJ b5AfTVckBWdepP6guLAK8gmlj0gd X-Google-Smtp-Source: ABdhPJxq6reJIpHqqq1ZNxe0rdbjVnwm7KawYG41ckEfykIaD81sySVYpVE/A1g21o+quyakuj34yQ== X-Received: by 2002:adf:a157:: with SMTP id r23mr12982188wrr.92.1591928733025; Thu, 11 Jun 2020 19:25:33 -0700 (PDT) Received: from localhost.ibm.com (123-243-125-185.tpgi.com.au. [123.243.125.185]) by smtp.gmail.com with ESMTPSA id h7sm6756948wml.24.2020.06.11.19.25.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Jun 2020 19:25:32 -0700 (PDT) From: Oliver O'Halloran To: skiboot@lists.ozlabs.org Date: Fri, 12 Jun 2020 12:24:49 +1000 Message-Id: <20200612022452.371685-13-oohall@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200612022452.371685-1-oohall@gmail.com> References: <20200612022452.371685-1-oohall@gmail.com> MIME-Version: 1.0 Subject: [Skiboot] [PATCH 12/15] test: Do gcov builds as a seperate pass X-BeenThere: skiboot@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Mailing list for skiboot development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: skiboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Skiboot" We only really use the gcov output when doing the coverage report as a part of the "docs" CI builds. It's useful for development to just run the unit tests so make sure the "check" and "coverage" targets are seperate. This also speeds up our CI builds since those jobs are already doing a seperate GCOV pass so building and running the GCOV binaries during the check pass is redundant. Signed-off-by: Oliver O'Halloran --- Tbh, we could probably drop the gcov builds outside the docs container. We don't do anything with the gcov output for most of the builds, but I guess it's useful to at least verify it builds. --- ccan/Makefile.check | 5 ++--- core/test/Makefile.check | 3 +-- hw/ipmi/test/Makefile.check | 2 +- libflash/test/Makefile.check | 2 +- libstb/secvar/test/Makefile.check | 6 ++---- libstb/test/Makefile.check | 4 ++-- 6 files changed, 9 insertions(+), 13 deletions(-) diff --git a/ccan/Makefile.check b/ccan/Makefile.check index a5967661881e..e9c23970fff6 100644 --- a/ccan/Makefile.check +++ b/ccan/Makefile.check @@ -4,12 +4,11 @@ LCOV_EXCLUDE += $(CCAN_TEST_SRC) ccan/list/test/helper.c CCAN_TEST := $(CCAN_TEST_SRC:%.c=%) - -.PHONY: $(CCAN_TEST:%=%-gcov-run) ccan-check +.PHONY: ccan-check ccan-check: $(CCAN_TEST:%=%-check) -check: ccan-check $(CCAN_TEST:%=%-gcov-run) +check: ccan-check .PHONY: ccan-coverage diff --git a/core/test/Makefile.check b/core/test/Makefile.check index 8e59ef00e7b6..7c347bea2a56 100644 --- a/core/test/Makefile.check +++ b/core/test/Makefile.check @@ -35,8 +35,7 @@ LCOV_EXCLUDE += $(CORE_TEST:%=%.c) core/test/stubs.c LCOV_EXCLUDE += $(CORE_TEST_NOSTUB:%=%.c) /usr/include/* .PHONY : core-check -core-check: $(CORE_TEST:%=%-check) $(CORE_TEST:%=%-gcov-run) -core-check: $(CORE_TEST_NOSTUB:%=%-check) $(CORE_TEST_NOSTUB:%=%-gcov-run) +core-check: $(CORE_TEST:%=%-check) $(CORE_TEST_NOSTUB:%=%-check) .PHONY : core-coverage core-coverage: $(CORE_TEST:%=%-gcov-run) diff --git a/hw/ipmi/test/Makefile.check b/hw/ipmi/test/Makefile.check index c3d6359c411b..ceed1ed396b8 100644 --- a/hw/ipmi/test/Makefile.check +++ b/hw/ipmi/test/Makefile.check @@ -4,7 +4,7 @@ IPMI_TEST := hw/ipmi/test/run-fru LCOV_EXCLUDE += $(IPMI_TEST:%=%.c) .PHONY : hw-ipmi-check hw-ipmi-coverage -hw-ipmi-check: $(IPMI_TEST:%=%-check) $(IPMI_TEST:%=%-gcov-run) +hw-ipmi-check: $(IPMI_TEST:%=%-check) hw-ipmi-coverage: $(IPMI_TEST:%=%-gcov-run) check: hw-ipmi-check diff --git a/libflash/test/Makefile.check b/libflash/test/Makefile.check index 1e55237193f0..4dbd7ee75203 100644 --- a/libflash/test/Makefile.check +++ b/libflash/test/Makefile.check @@ -33,7 +33,7 @@ check_PROGRAMS = \ TEST_FLAGS = -D__TEST__ -MMD -MP .PHONY: libflash-check libflash-coverage -libflash-check: $(check_PROGRAMS:%=%-check) $(CORE_TEST:%=%-gcov-run) +libflash-check: $(check_PROGRAMS:%=%-check) libflash-coverage: $(check_PROGRAMS:%=%-gcov-run) clean: libflash-test-clean check: libflash-check diff --git a/libstb/secvar/test/Makefile.check b/libstb/secvar/test/Makefile.check index b41eaf4831ba..bba1197e63b5 100644 --- a/libstb/secvar/test/Makefile.check +++ b/libstb/secvar/test/Makefile.check @@ -8,12 +8,10 @@ SECVAR_TEST = $(patsubst %.c, %, $(wildcard $(SECVAR_TEST_DIR)/secvar-test-*.c)) HOSTCFLAGS+=-I . -I include .PHONY : secvar-check -secvar-check: $(SECVAR_TEST:%=%-check) $(SECVAR_TEST:%=%-gcov-run) -secvar-check: $(SECVAR_TEST_NOSTUB:%=%-check) $(SECVAR_TEST_NOSTUB:%=%-gcov-run) +secvar-check: $(SECVAR_TEST:%=%-check) $(SECVAR_TEST_NOSTUB:%=%-check) .PHONY : secvar-coverage -secvar-coverage: $(SECVAR_TEST:%=%-gcov-run) -secvar-coverage: $(SECVAR_TEST_NOSTUB:%=%-gcov-run) +secvar-coverage: $(SECVAR_TEST:%=%-gcov-run) $(SECVAR_TEST_NOSTUB:%=%-gcov-run) check: secvar-check coverage: secvar-coverage diff --git a/libstb/test/Makefile.check b/libstb/test/Makefile.check index d4d7cb46c7a2..6911e0aebc75 100644 --- a/libstb/test/Makefile.check +++ b/libstb/test/Makefile.check @@ -9,8 +9,8 @@ libstb/test/print-stb-container-q: libstb/print-container $(call Q, TEST , $(VALGRIND) libstb/print-container -I libstb/test/t.container |diff -u libstb/test/t.container.out -, $< t.container) .PHONY : libstb-check -libstb-check: $(LIBSTB_TEST:%=%-check) $(LIBSTB_TEST:%=%-gcov-run) libstb/test/print-stb-container-check -libstb-check: $(LIBSTB_TEST_NOSTUB:%=%-check) $(LIBSTB_TEST_NOSTUB:%=%-gcov-run) +libstb-check: $(LIBSTB_TEST:%=%-check) libstb/test/print-stb-container-check +libstb-check: $(LIBSTB_TEST_NOSTUB:%=%-check) .PHONY : libstb-coverage libstb-coverage: $(LIBSTB_TEST:%=%-gcov-run)