From patchwork Mon Oct 18 11:09:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Martin_Li=C5=A1ka?= X-Patchwork-Id: 46337 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id C7854385840D for ; Mon, 18 Oct 2021 11:09:37 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by sourceware.org (Postfix) with ESMTPS id D62C33858027 for ; Mon, 18 Oct 2021 11:09:20 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org D62C33858027 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=suse.cz Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.cz Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id DB50D2190B for ; Mon, 18 Oct 2021 11:09:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1634555359; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z/khhcUeyn4y/9SIsWN1q5WVi7h43ftR1L6obUoGuPs=; b=hXklZlN2dQ35DBcFkJMylfygIm6I3FgZivG9/572LoSAyqSUVcuVuCKY1q807s22la2wLd 9AgTr5LI6D0PL5RHO+qq6MrrTP1TiRhQ8GghKBR13noJpLVRF/RoaWQTL3zSBmxdH9b4qk ZGkZfz+HKXiThChxK5JpDqwZwubKeE4= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1634555359; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z/khhcUeyn4y/9SIsWN1q5WVi7h43ftR1L6obUoGuPs=; b=L7eyiNBxuVuZ3z0b9ve7mogBiu4XYINiuZBEQ91AXrFyKJKKj7ajwAKdULSagF9xMhI091 mqEsvLPGJexPzPAA== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id C982813C14 for ; Mon, 18 Oct 2021 11:09:19 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id ZM5yL99VbWGIEAAAMHmgww (envelope-from ) for ; Mon, 18 Oct 2021 11:09:19 +0000 Message-ID: <3f1d4c5e-524c-f3c1-60b5-ac0c57496cf4@suse.cz> Date: Mon, 18 Oct 2021 13:09:19 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.2.0 From: =?utf-8?q?Martin_Li=C5=A1ka?= Subject: [PATCH] gcov: return proper exit code when error happens To: gcc-patches@gcc.gnu.org Content-Language: en-US X-Spam-Status: No, score=-10.3 required=5.0 tests=BAYES_00, DKIM_INVALID, DKIM_SIGNED, GIT_PATCH_0, KAM_DMARC_STATUS, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" Hello. The patch records error codes when something serious happens during emission of GCOV reports. Patch can bootstrap on x86_64-linux-gnu and survives regression tests. I'm going to push the change. Thanks, Martin PR gcov-profile/102746 PR gcov-profile/102747 gcc/ChangeLog: * gcov.c (main): Return return_code. (output_gcov_file): Mark return_code when error happens. (generate_results): Likewise. (read_graph_file): Likewise. (read_count_file): Likewise. --- gcc/gcov.c | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/gcc/gcov.c b/gcc/gcov.c index 3672ae7a6f8..34f53ac2d78 100644 --- a/gcc/gcov.c +++ b/gcc/gcov.c @@ -638,6 +638,9 @@ static int flag_preserve_paths = 0; static int flag_counts = 0; +/* Return code of the tool invocation. */ +static int return_code = 0; + /* Forward declarations. */ static int process_args (int, char **); static void print_usage (int) ATTRIBUTE_NORETURN; @@ -907,7 +910,7 @@ main (int argc, char **argv) if (!flag_use_stdout) executed_summary (total_lines, total_executed); - return 0; + return return_code; } /* Print a usage message and exit. If ERROR_P is nonzero, this is an error, @@ -1467,12 +1470,18 @@ output_gcov_file (const char *file_name, source_info *src) fnotice (stdout, "Creating '%s'\n", gcov_file_name); output_lines (gcov_file, src); if (ferror (gcov_file)) - fnotice (stderr, "Error writing output file '%s'\n", - gcov_file_name); + { + fnotice (stderr, "Error writing output file '%s'\n", + gcov_file_name); + return_code = 6; + } fclose (gcov_file); } else - fnotice (stderr, "Could not open output file '%s'\n", gcov_file_name); + { + fnotice (stderr, "Could not open output file '%s'\n", gcov_file_name); + return_code = 6; + } } else { @@ -1594,6 +1603,7 @@ generate_results (const char *file_name) { fnotice (stderr, "Cannot open JSON output file %s\n", gcov_intermediate_filename.c_str ()); + return_code = 6; return; } @@ -1602,6 +1612,7 @@ generate_results (const char *file_name) { fnotice (stderr, "Error writing JSON output file %s\n", gcov_intermediate_filename.c_str ()); + return_code = 6; return; } } @@ -1790,12 +1801,14 @@ read_graph_file (void) if (!gcov_open (bbg_file_name, 1)) { fnotice (stderr, "%s:cannot open notes file\n", bbg_file_name); + return_code = 1; return; } bbg_file_time = gcov_time (); if (!gcov_magic (gcov_read_unsigned (), GCOV_NOTE_MAGIC)) { fnotice (stderr, "%s:not a gcov notes file\n", bbg_file_name); + return_code = 2; gcov_close (); return; } @@ -1810,6 +1823,7 @@ read_graph_file (void) fnotice (stderr, "%s:version '%.4s', prefer '%.4s'\n", bbg_file_name, v, e); + return_code = 3; } bbg_stamp = gcov_read_unsigned (); /* Read checksum. */ @@ -1977,6 +1991,7 @@ read_graph_file (void) { corrupt:; fnotice (stderr, "%s:corrupted\n", bbg_file_name); + return_code = 4; break; } } @@ -2009,6 +2024,7 @@ read_count_file (void) if (!gcov_magic (gcov_read_unsigned (), GCOV_DATA_MAGIC)) { fnotice (stderr, "%s:not a gcov data file\n", da_file_name); + return_code = 2; cleanup:; gcov_close (); return 1; @@ -2023,11 +2039,13 @@ read_count_file (void) fnotice (stderr, "%s:version '%.4s', prefer version '%.4s'\n", da_file_name, v, e); + return_code = 3; } tag = gcov_read_unsigned (); if (tag != bbg_stamp) { fnotice (stderr, "%s:stamp mismatch with notes file\n", da_file_name); + return_code = 5; goto cleanup; } @@ -2088,6 +2106,7 @@ read_count_file (void) ? N_("%s:overflowed\n") : N_("%s:corrupted\n"), da_file_name); + return_code = 4; goto cleanup; } }