[8.3 backport][gdb/testsuite] Fix regexp in skip_opencl_tests
Joel Brobecker
brobecker@adacore.com
Mon Sep 16 21:58:00 GMT 2019
> > 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
> > }
> >
--
Joel
More information about the Gdb-patches
mailing list