Message ID | 20190429145451.GA7738@delia |
---|---|
State | New, archived |
Headers |
Received: (qmail 103292 invoked by alias); 29 Apr 2019 14:54:59 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: <gdb-patches.sourceware.org> List-Unsubscribe: <mailto:gdb-patches-unsubscribe-##L=##H@sourceware.org> List-Subscribe: <mailto:gdb-patches-subscribe@sourceware.org> List-Archive: <http://sourceware.org/ml/gdb-patches/> List-Post: <mailto:gdb-patches@sourceware.org> List-Help: <mailto:gdb-patches-help@sourceware.org>, <http://sourceware.org/ml/#faqs> Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 103224 invoked by uid 89); 29 Apr 2019 14:54:58 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-25.7 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_PASS autolearn=ham version=3.3.1 spammy=HX-Languages-Length:1633 X-HELO: mx1.suse.de Received: from mx2.suse.de (HELO mx1.suse.de) (195.135.220.15) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 29 Apr 2019 14:54:57 +0000 Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 260ECAB6D for <gdb-patches@sourceware.org>; Mon, 29 Apr 2019 14:54:55 +0000 (UTC) Date: Mon, 29 Apr 2019 16:54:53 +0200 From: Tom de Vries <tdevries@suse.de> To: gdb-patches@sourceware.org Subject: [committed][gdb/testsuite] Fix regexp in skip_opencl_tests Message-ID: <20190429145451.GA7738@delia> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.10.1 (2018-07-13) X-IsSubscribed: yes |
Commit Message
Tom de Vries
April 29, 2019, 2:54 p.m. UTC
Hi, When running gdb-caching-proc.exp, if skip_opencl_tests fails like this: ... (gdb) run Starting program: \ build/gdb/testsuite/outputs/gdb.base/gdb-caching-proc/opencltest13530.x CHK_ERR (clGetPlatformIDs (1, &platform, NULL), -1001) src/gdb/testsuite/lib/opencl_hostapp.c:73 error: Unknown [Inferior 1 (process 13600) exited with code 01] (gdb) skip_opencl_tests: OpenCL support not detected ... then this regexp in skip_opencl_tests fails to match: ... -re ".*$inferior_exited_re code.*${gdb_prompt} $" { ... so instead we hit the default clause after a 30 seconds timeout. With the iteration count set at 10, we end up taking 6 minutes to run this test-case. Fix this by adding the missing "with" in the regexp, bring back the runtime to half a minute. Tested on x86_64-linux. Committed to trunk. Thanks, - Tom [gdb/testsuite] Fix regexp in skip_opencl_tests gdb/testsuite/ChangeLog: 2019-04-29 Tom de Vries <tdevries@suse.de> * lib/opencl.exp (skip_opencl_tests): Add missing "with" in regexp. --- gdb/testsuite/lib/opencl.exp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Comments
On 29-04-19 16:54, Tom de Vries wrote: > Hi, > > When running gdb-caching-proc.exp, if skip_opencl_tests fails like this: > ... > (gdb) run > Starting program: \ > build/gdb/testsuite/outputs/gdb.base/gdb-caching-proc/opencltest13530.x > CHK_ERR (clGetPlatformIDs (1, &platform, NULL), -1001) > src/gdb/testsuite/lib/opencl_hostapp.c:73 error: Unknown > [Inferior 1 (process 13600) exited with code 01] > (gdb) > skip_opencl_tests: OpenCL support not detected > ... > then this regexp in skip_opencl_tests fails to match: > ... > -re ".*$inferior_exited_re code.*${gdb_prompt} $" { > ... > so instead we hit the default clause after a 30 seconds timeout. With the > iteration count set at 10, we end up taking 6 minutes to run this test-case. > > Fix this by adding the missing "with" in the regexp, bring back the runtime to > half a minute. > > Tested on x86_64-linux. > > Committed to trunk. > Hi, ok to backport to 8.3 branch? This applies cleanly, and reduces testing time with ~5 minutes (with a total testing time of ~30 minutes) on my laptop. Thanks, - Tom > > [gdb/testsuite] Fix regexp in skip_opencl_tests > > gdb/testsuite/ChangeLog: > > 2019-04-29 Tom de Vries <tdevries@suse.de> > > * lib/opencl.exp (skip_opencl_tests): Add missing "with" in regexp. > > --- > gdb/testsuite/lib/opencl.exp | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/gdb/testsuite/lib/opencl.exp b/gdb/testsuite/lib/opencl.exp > index 4d353de246..33eb437bc8 100644 > --- a/gdb/testsuite/lib/opencl.exp > +++ b/gdb/testsuite/lib/opencl.exp > @@ -58,7 +58,7 @@ gdb_caching_proc skip_opencl_tests { > verbose -log "\n$me: OpenCL support detected" > set result 0 > } > - -re ".*$inferior_exited_re code.*${gdb_prompt} $" { > + -re ".*$inferior_exited_re with code.*${gdb_prompt} $" { > verbose -log "\n$me: OpenCL support not detected" > set result 1 > } >
> > When running gdb-caching-proc.exp, if skip_opencl_tests fails like this: > > ... > > (gdb) run > > Starting program: \ > > build/gdb/testsuite/outputs/gdb.base/gdb-caching-proc/opencltest13530.x > > CHK_ERR (clGetPlatformIDs (1, &platform, NULL), -1001) > > src/gdb/testsuite/lib/opencl_hostapp.c:73 error: Unknown > > [Inferior 1 (process 13600) exited with code 01] > > (gdb) > > skip_opencl_tests: OpenCL support not detected > > ... > > then this regexp in skip_opencl_tests fails to match: > > ... > > -re ".*$inferior_exited_re code.*${gdb_prompt} $" { > > ... > > so instead we hit the default clause after a 30 seconds timeout. With the > > iteration count set at 10, we end up taking 6 minutes to run this test-case. > > > > Fix this by adding the missing "with" in the regexp, bring back the runtime to > > half a minute. > > > > Tested on x86_64-linux. > > > > Committed to trunk. > > > > Hi, > > ok to backport to 8.3 branch? > > This applies cleanly, and reduces testing time with ~5 minutes (with a > total testing time of ~30 minutes) on my laptop. Looks OK for 8.3.1 indeed, but you'll need to create a GDB PR on bugzilla for it (assuming not already existing), and then reference that PR in the ChangeLog entry (and the corresponding revision log in the commit log). Thank you! > > Thanks, > - Tom > > > > > [gdb/testsuite] Fix regexp in skip_opencl_tests > > > > gdb/testsuite/ChangeLog: > > > > 2019-04-29 Tom de Vries <tdevries@suse.de> > > > > * lib/opencl.exp (skip_opencl_tests): Add missing "with" in regexp. > > > > --- > > gdb/testsuite/lib/opencl.exp | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/gdb/testsuite/lib/opencl.exp b/gdb/testsuite/lib/opencl.exp > > index 4d353de246..33eb437bc8 100644 > > --- a/gdb/testsuite/lib/opencl.exp > > +++ b/gdb/testsuite/lib/opencl.exp > > @@ -58,7 +58,7 @@ gdb_caching_proc skip_opencl_tests { > > verbose -log "\n$me: OpenCL support detected" > > set result 0 > > } > > - -re ".*$inferior_exited_re code.*${gdb_prompt} $" { > > + -re ".*$inferior_exited_re with code.*${gdb_prompt} $" { > > verbose -log "\n$me: OpenCL support not detected" > > set result 1 > > } > >
diff --git a/gdb/testsuite/lib/opencl.exp b/gdb/testsuite/lib/opencl.exp index 4d353de246..33eb437bc8 100644 --- a/gdb/testsuite/lib/opencl.exp +++ b/gdb/testsuite/lib/opencl.exp @@ -58,7 +58,7 @@ gdb_caching_proc skip_opencl_tests { verbose -log "\n$me: OpenCL support detected" set result 0 } - -re ".*$inferior_exited_re code.*${gdb_prompt} $" { + -re ".*$inferior_exited_re with code.*${gdb_prompt} $" { verbose -log "\n$me: OpenCL support not detected" set result 1 }