public inbox for gdb-testers@sourceware.org help / color / mirror / Atom feed
From: gdb-buildbot@sergiodj.net To: gdb-testers@sourceware.org Subject: [binutils-gdb] contrib: Update dg-extract-results.* from gcc Date: Wed, 23 Oct 2019 17:33:00 -0000 [thread overview] Message-ID: <66b92822fa721b17c9edfebd10b3017b289be24c@gdb-build> (raw) *** TEST RESULTS FOR COMMIT 66b92822fa721b17c9edfebd10b3017b289be24c *** commit 66b92822fa721b17c9edfebd10b3017b289be24c Author: Andrew Burgess <andrew.burgess@embecosm.com> AuthorDate: Mon Oct 21 14:52:37 2019 +0100 Commit: Andrew Burgess <andrew.burgess@embecosm.com> CommitDate: Mon Oct 21 15:26:48 2019 +0100 contrib: Update dg-extract-results.* from gcc The dg-extract-results scripts have been updated in the gcc repository. This commit copies the updated versions of the scripts in to the binutils-gdb repository. There are two changes, these are: 1. Improved detection of timeout lines, though I suspect this only applies to gcc results, and 2. Detection of KPASS results, this is of interest to gdb, where these results would not be included in the final .sum file. A grep over binutils-gdb shows the dg-extract-results is not used by ld, gas, or binutils, however I tested these anyway and saw no changes in the final .sum files (tested on x86-64 GNU/Linux). On gdb when running tests in parallel dg-extract-results is used, and the final .sum file now includes the KPASS results. contrib/ChangeLog: * dg-extract-results.py: Update from gcc repo. * dg-extract-results.sh: Likewise. Change-Id: I54abd07f4e8f5cf88a6db74519674f6939860157 diff --git a/contrib/ChangeLog b/contrib/ChangeLog index 8ce67659c0..489af77445 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -1,3 +1,8 @@ +2019-10-21 Andrew Burgess <andrew.burgess@embecosm.com> + + * dg-extract-results.py: Update from gcc repo. + * dg-extract-results.sh: Likewise. + 2018-08-06 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> * dg-extract-results.sh: Move from gdb/testsuite. diff --git a/contrib/dg-extract-results.py b/contrib/dg-extract-results.py index 4b02a5bea9..7100794d42 100644 --- a/contrib/dg-extract-results.py +++ b/contrib/dg-extract-results.py @@ -117,7 +117,7 @@ class Prog: self.tool_re = re.compile (r'^\t\t=== (.*) tests ===$') self.result_re = re.compile (r'^(PASS|XPASS|FAIL|XFAIL|UNRESOLVED' r'|WARNING|ERROR|UNSUPPORTED|UNTESTED' - r'|KFAIL):\s*(.+)') + r'|KFAIL|KPASS):\s*(.+)') self.completed_re = re.compile (r'.* completed at (.*)') # Pieces of text to write at the head of the output. # start_line is a pair in which the first element is a datetime @@ -239,6 +239,7 @@ class Prog: harness = None segment = None final_using = 0 + has_warning = 0 # If this is the first run for this variation, add any text before # the first harness to the header. @@ -292,10 +293,22 @@ class Prog: # Ugly hack to get the right order for gfortran. if name.startswith ('gfortran.dg/g77/'): name = 'h' + name - key = (name, len (harness.results)) - harness.results.append ((key, line)) - if not first_key and sort_logs: - first_key = key + # If we have a time out warning, make sure it appears + # before the following testcase diagnostic: we insert + # the testname before 'program' so that sort faces a + # list of testnames. + if line.startswith ('WARNING: program timed out'): + has_warning = 1 + else: + if has_warning == 1: + key = (name, len (harness.results)) + myline = 'WARNING: %s program timed out.\n' % name + harness.results.append ((key, myline)) + has_warning = 0 + key = (name, len (harness.results)) + harness.results.append ((key, line)) + if not first_key and sort_logs: + first_key = key if line.startswith ('ERROR: (DejaGnu)'): for i in range (len (self.count_names)): if 'DejaGnu errors' in self.count_names[i]: diff --git a/contrib/dg-extract-results.sh b/contrib/dg-extract-results.sh index 6ee3d26de3..f948088370 100755 --- a/contrib/dg-extract-results.sh +++ b/contrib/dg-extract-results.sh @@ -298,6 +298,8 @@ BEGIN { cnt=0 print_using=0 need_close=0 + has_timeout=0 + timeout_cnt=0 } /^EXPFILE: / { expfiles[expfileno] = \$2 @@ -324,23 +326,51 @@ BEGIN { } } /^\t\t=== .* ===$/ { curvar = ""; next } -/^(PASS|XPASS|FAIL|XFAIL|UNRESOLVED|WARNING|ERROR|UNSUPPORTED|UNTESTED|KFAIL):/ { +/^(PASS|XPASS|FAIL|XFAIL|UNRESOLVED|WARNING|ERROR|UNSUPPORTED|UNTESTED|KFAIL|KPASS):/ { testname=\$2 # Ugly hack for gfortran.dg/dg.exp if ("$TOOL" == "gfortran" && testname ~ /^gfortran.dg\/g77\//) testname="h"testname + if ("$MODE" == "sum") { + if (\$0 ~ /^WARNING: program timed out/) { + has_timeout=1 + timeout_cnt=cnt+1 + } else { + # Prepare timeout replacement message in case it's needed + timeout_msg=\$0 + sub(\$1, "WARNING:", timeout_msg) + } + } } /^$/ { if ("$MODE" == "sum") next } { if (variant == curvar && curfile) { if ("$MODE" == "sum") { - printf "%s %08d|", testname, cnt >> curfile - cnt = cnt + 1 + # Do not print anything if the current line is a timeout + if (has_timeout == 0) { + # If the previous line was a timeout, + # insert the full current message without keyword + if (timeout_cnt != 0) { + printf "%s %08d|%s program timed out.\n", testname, timeout_cnt-1, timeout_msg >> curfile + timeout_cnt = 0 + cnt = cnt + 1 + } + printf "%s %08d|", testname, cnt >> curfile + cnt = cnt + 1 + filewritten[curfile]=1 + need_close=1 + print >> curfile + } + has_timeout=0 + } else { + filewritten[curfile]=1 + need_close=1 + print >> curfile } - filewritten[curfile]=1 - need_close=1 - print >> curfile - } else + } else { + has_timeout=0 + timeout_cnt=0 next + } } END { n=1
next reply other threads:[~2019-10-23 17:33 UTC|newest] Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-10-23 17:33 gdb-buildbot [this message] 2019-10-23 17:33 ` Failures on Ubuntu-Aarch64-m64, branch master gdb-buildbot 2019-10-23 18:08 ` Failures on Ubuntu-Aarch64-native-extended-gdbserver-m64, " gdb-buildbot 2019-10-23 18:39 ` Failures on Ubuntu-Aarch64-native-gdbserver-m64, " gdb-buildbot 2019-11-08 2:50 ` Failures on Fedora-x86_64-cc-with-index, " gdb-buildbot 2019-11-08 4:28 ` Failures on Fedora-x86_64-native-extended-gdbserver-m32, " gdb-buildbot 2019-11-08 5:51 ` Failures on Fedora-x86_64-native-gdbserver-m32, " gdb-buildbot 2019-11-08 6:03 ` Failures on Fedora-x86_64-native-gdbserver-m64, " gdb-buildbot 2020-06-08 4:17 [binutils-gdb] contrib: Update dg-extract-results.* from gcc gdb-buildbot
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=66b92822fa721b17c9edfebd10b3017b289be24c@gdb-build \ --to=gdb-buildbot@sergiodj.net \ --cc=gdb-testers@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).