From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm1-x344.google.com (mail-wm1-x344.google.com [IPv6:2a00:1450:4864:20::344]) by sourceware.org (Postfix) with ESMTPS id C8515395A07A for ; Thu, 23 Apr 2020 17:54:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org C8515395A07A Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=embecosm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=andrew.burgess@embecosm.com Received: by mail-wm1-x344.google.com with SMTP id u127so7515046wmg.1 for ; Thu, 23 Apr 2020 10:54:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=RNPGpKHvs/oYfGF/+IXNKZvGHa3S8nFDzw3gfO5A9Qk=; b=C/GRXILp7FxP3UHZlKDby4YPCFyB+CquPGy4a0yW7sEB2WrnEW75PWtZVZWzBEHXRN +oM5fdNWe+ZnChuYsuLj0AXBj3gF0YG1AABM2/gHYIYejPKDGhhID8tcC5dx4h6za4Q6 gYBZX+Qv8l1SrOZOhm4zI/CJLQKeVnIJBT2tqKhjE7jxaN5f4n1Yog7X8f+5dpX5Rj31 LlXnHCwfKCiC6jXbbA4E650KBxp/jqFkyydqwmYEAewWRn+6ednShdT0QuWPfI/Rsc7H woV3GzMSj6FUZzJBwuwRBOzPsLYvuBGotuL+nxCSHqZF29qZvE+vB7lTHt/0EAaztcBp WPyw== 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=RNPGpKHvs/oYfGF/+IXNKZvGHa3S8nFDzw3gfO5A9Qk=; b=UXTW4pcxUQoXbMz4va7tPj4OZkw0wwurNPTCUAQTQS3Ei/MvM72I6N0YAgUZHkzmT8 rpEwsR0MxhGycfLgWmqARLFS1kV+KhsXk0QUfQ0JnZH+cmPArVn2trJZ93fZxzLj9O/v QjW0WIEnUL7qhXwQFvQZLbq85ECLOd3ZCZ+Y4FOuJ6YAF2MjPMPM0ktK5TlK4JKJXELu whCSJQrH/b5XubhrLyop0LTBm+3B9o7BvqLtR9/q2kmnF7os66AsjF8mIOOJ4/b8DCh1 Dglw22WQKjp2x0mujYCa9TbaTQDajHWTCPJZCwhhjdHti3uqI6OLIDTkLX2bFwOMIXGx i0gg== X-Gm-Message-State: AGi0PuYixJeIHTs0WlxUWKudMJBy0bOu6TSSI3pK9QYzevyP3fTL6K8o IKBU2k1Df82e8ZFXkiv9Uj+L2qhsmN4= X-Google-Smtp-Source: APiQypLJ8vktYEUlIA7AqOqAosfOGmhSlK6rWJ+mOnMgESdY4dqI7xEoEmXNgqeCOUtvrDgZkjvaUA== X-Received: by 2002:a1c:b757:: with SMTP id h84mr5390842wmf.188.1587664447587; Thu, 23 Apr 2020 10:54:07 -0700 (PDT) Received: from localhost (host81-151-181-184.range81-151.btcentralplus.com. [81.151.181.184]) by smtp.gmail.com with ESMTPSA id h3sm4655782wrm.73.2020.04.23.10.54.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Apr 2020 10:54:06 -0700 (PDT) From: Andrew Burgess To: gdb-patches@sourceware.org Subject: [PATCH 4/4] contrib: Handle GDB specific test result types Date: Thu, 23 Apr 2020 18:53:58 +0100 Message-Id: <57ce275f565193d3d69f79e7e8b57a0d4d9169a1.1587663712.git.andrew.burgess@embecosm.com> X-Mailer: git-send-email 2.25.3 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-24.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Apr 2020 17:54:10 -0000 NOTE: I know that this patch needs to go through the GCC list and then be back-ported to the binutils-gdb repository. I'm posting it here for completeness while the other patches in this series are discussed. If the general idea is approved for GDB then I'll get this merged through the GCC route. When running Dejagnu on GDB we can now (sometimes) see two additional test result types, these are '# of paths in test names' and '# of duplicate test names'. If the test is run in parallel mode (make -j...) then these extra test results will appear in the individual test summary files, but are not merged into the final summary file. This commit adds support to the merge scripts to carry over these extra result types. contrib/ChangeLog: * dg-extract-results.py: Handle GDB specific test types. * dg-extract-results.sh: Likewise. --- contrib/ChangeLog | 5 +++++ contrib/dg-extract-results.py | 4 +++- contrib/dg-extract-results.sh | 10 ++++++++++ 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/contrib/dg-extract-results.py b/contrib/dg-extract-results.py index 7100794d42a..b86a4af6b60 100644 --- a/contrib/dg-extract-results.py +++ b/contrib/dg-extract-results.py @@ -143,7 +143,9 @@ class Prog: '# of known failures\t\t', '# of untested testcases\t\t', '# of unresolved testcases\t', - '# of unsupported tests\t\t' + '# of unsupported tests\t\t', + '# of paths in test names\t', + '# of duplicate test names\t' ] self.runs = dict() diff --git a/contrib/dg-extract-results.sh b/contrib/dg-extract-results.sh index f948088370e..021a4f407ac 100755 --- a/contrib/dg-extract-results.sh +++ b/contrib/dg-extract-results.sh @@ -400,6 +400,7 @@ BEGIN { variant="$VAR" tool="$TOOL" passcnt=0; failcnt=0; untstcnt=0; xpasscnt=0; xfailcnt=0; kpasscnt=0; kfailcnt=0; unsupcnt=0; unrescnt=0; dgerrorcnt=0; + pathcnt=0; dupcnt=0 curvar=""; insummary=0 } /^Running target / { curvar = \$3; next } @@ -414,6 +415,8 @@ BEGIN { /^# of untested testcases/ { if (insummary == 1) untstcnt += \$5; next; } /^# of unresolved testcases/ { if (insummary == 1) unrescnt += \$5; next; } /^# of unsupported tests/ { if (insummary == 1) unsupcnt += \$5; next; } +/^# of paths in test names/ { if (insummary == 1) pathcnt += \$7; next; } +/^# of duplicate test names/ { if (insummary == 1) dupcnt += \$6; next; } /^$/ { if (insummary == 1) { insummary = 0; curvar = "" } next @@ -431,6 +434,8 @@ END { if (untstcnt != 0) printf ("# of untested testcases\t\t%d\n", untstcnt) if (unrescnt != 0) printf ("# of unresolved testcases\t%d\n", unrescnt) if (unsupcnt != 0) printf ("# of unsupported tests\t\t%d\n", unsupcnt) + if (pathcnt != 0) printf ("# of paths in test names\t%d\n", pathcnt) + if (dupcnt != 0) printf ("# of duplicate test names\t%d\n", dupcnt) } EOF @@ -452,6 +457,7 @@ cat << EOF > $TOTAL_AWK BEGIN { tool="$TOOL" passcnt=0; failcnt=0; untstcnt=0; xpasscnt=0; xfailcnt=0; kfailcnt=0; unsupcnt=0; unrescnt=0; dgerrorcnt=0 + pathcnt=0; dupcnt=0 } /^# of DejaGnu errors/ { dgerrorcnt += \$5 } /^# of expected passes/ { passcnt += \$5 } @@ -463,6 +469,8 @@ BEGIN { /^# of untested testcases/ { untstcnt += \$5 } /^# of unresolved testcases/ { unrescnt += \$5 } /^# of unsupported tests/ { unsupcnt += \$5 } +/^# of paths in test names/ { pathcnt += \$7 } +/^# of duplicate test names/ { dupcnt += \$6 } END { printf ("\n\t\t=== %s Summary ===\n\n", tool) if (dgerrorcnt != 0) printf ("# of DejaGnu errors\t\t%d\n", dgerrorcnt) @@ -475,6 +483,8 @@ END { if (untstcnt != 0) printf ("# of untested testcases\t\t%d\n", untstcnt) if (unrescnt != 0) printf ("# of unresolved testcases\t%d\n", unrescnt) if (unsupcnt != 0) printf ("# of unsupported tests\t\t%d\n", unsupcnt) + if (pathcnt != 0) printf ("# of paths in test names\t%d\n", pathcnt) + if (dupcnt != 0) printf ("# of duplicate test names\t%d\n", dupcnt) } EOF -- 2.25.3