From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from eggs.gnu.org (eggs.gnu.org [IPv6:2001:470:142:3::10]) by sourceware.org (Postfix) with ESMTPS id C496A385E019 for ; Wed, 20 Dec 2023 06:31:38 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org C496A385E019 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gnu.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gnu.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org C496A385E019 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2001:470:142:3::10 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1703053901; cv=none; b=gw8PVqbjRnXILYehZjHhWx9Wso4MsHP4tklo9SU8QJtgGPQVUU1SfYO0LRGtZAUQiC+MdmHxZBc6vW2jcxHShsvQmYDN9FexCdC1Bc5/jqCfr+Tive+CINU5UKyVOLrckBpfnUUKGyZ70Dtd7VOh5l5EZdTjJqN0W25WegkQo4I= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1703053901; c=relaxed/simple; bh=ihSbM1Z99V/INq/1IMcFoEpAXkTZ+epvXtOBfPPnFGc=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=k/+0x/7P3fWQO60DECtXaNSUCYehgLLDot6+LBQMJn8C1PsVlGnKABol0oFMxrJFEOZqNp5v2LDj+SobepBVNRndlact7y56f48eMobf6H9XbsZepLkWP+Mt6oayo5XnkI5TRCKznMrGZFOmEcn2y5TJ/vE+gOyAznC4+yzCxdw= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from linux-libre.fsfla.org ([2001:470:142:5::54] helo=free.home) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rFq7G-0005iM-30; Wed, 20 Dec 2023 01:31:38 -0500 Received: from livre (livre.home [172.31.160.2]) by free.home (8.15.2/8.15.2) with ESMTPS id 3BK6VQKd680382 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Wed, 20 Dec 2023 03:31:27 -0300 From: Alexandre Oliva To: Jeff Law Cc: "gcc-patches@gcc.gnu.org" Subject: [PATCH] compare_tests: distinguish c-c++-common results by tool Organization: Free thinker, not speaking for the GNU Project References: <76a02442-290a-4929-b566-035753afd859@gmail.com> Date: Wed, 20 Dec 2023 03:31:26 -0300 In-Reply-To: <76a02442-290a-4929-b566-035753afd859@gmail.com> (Jeff Law's message of "Tue, 19 Dec 2023 21:40:32 -0700") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Scanned-By: MIMEDefang 2.84 X-Spam-Status: No, score=-8.5 required=5.0 tests=BAYES_00,GIT_PATCH_0,KAM_DMARC_STATUS,SPF_HELO_PASS,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: On Dec 20, 2023, Jeff Law wrote: > So the strub tests in c-c++-common are problematical. They get run > twice, once for C, once for C++. Yet the name of the test is the same > in both runs. (by the name, I mean the name emitted into the dejagnu > summary and log files). > Thus if you have a test in there which passes in one context, but > fails in the other, comparison tools like contrib/compare_tests may > erroneously report the tests as both a test which now fails, but > passed before and a test which now passes but failed before. > It looks like some of the strub tests are currently known to fail with > C++ and are triggering this problem Yeah, type warnings/errors are different between C and C++, and this is noticeable with permissible conversions between strub types. > A third option would be to change the compare_tests tool to somehow > distinguish between the C and C++ tests. Not sure how feasible that > is. Most feasible among the possibilities ;-) I've tested the following by comparing my obj-x86_64-linux-gnu test tree with itself. Ok to install? When compare_tests compares both C and C++ tests in c-c++-common, they get the same identifier, so expected differences in results across languages become undesirably noisy. This patch adds tool identifiers to tests, so that runs by different tools are not confused by the compare logic. It also fixes a bug in reporting differences, that would attempt to print an undefined fname (the definitions are in subshell loops), and adjusts the target insertion to match tabs in addition to blanks after colons. for contrib/ChangeLog * compare_tests: Add tool to test lines. Match tabs besides blanks to insert tool and target. Don't print undefined fname. --- contrib/compare_tests | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/compare_tests b/contrib/compare_tests index 2dfa8640756a0..e09fc4f113a3f 100755 --- a/contrib/compare_tests +++ b/contrib/compare_tests @@ -96,7 +96,7 @@ if [ -d "$1" -a -d "$2" ] ; then ret=$? if [ $ret -ne 0 ]; then exit_status=`expr $exit_status + 1` - echo "## Differences found: $fname" + echo "## Differences found" fi if [ $exit_status -ne 0 ]; then echo "# $exit_status differences in $cmnsums common sum files found" @@ -108,8 +108,8 @@ elif [ -d "$1" -o -d "$2" ] ; then usage "Must specify either two directories or two files" fi -sed 's/^XFAIL/FAIL/; s/^ERROR/FAIL/; s/^XPASS/PASS/' < "$1" | awk '/^Running target / {target = $3} { if (target != "unix") { sub(/: /, "&"target": " ); }; print $0; }' | cut -c1-2000 >$tmp1 -sed 's/^XFAIL/FAIL/; s/^ERROR/FAIL/; s/^XPASS/PASS/' < "$2" | awk '/^Running target / {target = $3} { if (target != "unix") { sub(/: /, "&"target": " ); }; print $0; }' | cut -c1-2000 >$tmp2 +sed 's/^XFAIL/FAIL/; s/^ERROR/FAIL/; s/^XPASS/PASS/' < "$1" | awk '/^[ ]*=== [^ ]* tests ===$/ {tool = $2} /^Running target / {target = $3} { if (tool != "") { sub(/:[ ]/, "&"tool": " ); }; if (target != "unix") { sub(/:[ ]/, "&"target": " ); }; print $0; }' | cut -c1-2000 >$tmp1 +sed 's/^XFAIL/FAIL/; s/^ERROR/FAIL/; s/^XPASS/PASS/' < "$2" | awk '/^[ ]*=== [^ ]* tests ===$/ {tool = $2} /^Running target / {target = $3} { if (tool != "") { sub(/:[ ]/, "&"tool": " ); }; if (target != "unix") { sub(/:[ ]/, "&"target": " ); }; print $0; }' | cut -c1-2000 >$tmp2 before=$tmp1 now=$tmp2 -- Alexandre Oliva, happy hacker https://FSFLA.org/blogs/lxo/ Free Software Activist GNU Toolchain Engineer Disinformation flourishes because many people care deeply about injustice but very few check the facts. Think Assange & Stallman. The empires strike back