From d2b584a55b658fa52ffa3a42b689940d2e98e969 Mon Sep 17 00:00:00 2001 From: Tom de Vries Date: Mon, 29 Apr 2019 16:52:10 +0200 Subject: [PATCH] [gdb/testsuite] Fix regexp in skip_opencl_tests 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. gdb/testsuite/ChangeLog: 2019-04-29 Tom de Vries * lib/opencl.exp (skip_opencl_tests): Add missing "with" in regexp. --- gdb/testsuite/ChangeLog | 4 ++++ gdb/testsuite/lib/opencl.exp | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index e814093..b6c3618 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2019-04-29 Tom de Vries + + * lib/opencl.exp (skip_opencl_tests): Add missing "with" in regexp. + 2019-04-27 Philippe Waroquiers * gdb.base/callexit.exp: Test may-call-functions off. diff --git a/gdb/testsuite/lib/opencl.exp b/gdb/testsuite/lib/opencl.exp index 4d353de..33eb437 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 } -- 2.7.4