From afb754730e6c118eab8a96305c1c4675f4442869 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sun, 8 Jan 2023 11:42:26 -0700 Subject: [PATCH] Rename to allow_opencl_tests This changes skip_opencl_tests to invert the sense, and renames it to allow_opencl_tests. --- gdb/testsuite/gdb.opencl/callfuncs.exp | 2 +- gdb/testsuite/gdb.opencl/convs_casts.exp | 2 +- gdb/testsuite/gdb.opencl/datatypes.exp | 2 +- gdb/testsuite/gdb.opencl/operators.exp | 2 +- gdb/testsuite/gdb.opencl/vec_comps.exp | 2 +- gdb/testsuite/lib/opencl.exp | 16 ++++++++-------- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/gdb/testsuite/gdb.opencl/callfuncs.exp b/gdb/testsuite/gdb.opencl/callfuncs.exp index 98b34ab08cd..1fa3f8abcb0 100644 --- a/gdb/testsuite/gdb.opencl/callfuncs.exp +++ b/gdb/testsuite/gdb.opencl/callfuncs.exp @@ -19,7 +19,7 @@ load_lib opencl.exp -require !skip_opencl_tests +require allow_opencl_tests set testfile "callfuncs" set clprogram [remote_download target ${srcdir}/${subdir}/${testfile}.cl] diff --git a/gdb/testsuite/gdb.opencl/convs_casts.exp b/gdb/testsuite/gdb.opencl/convs_casts.exp index 9764d75fcb5..d648b7f6f0d 100644 --- a/gdb/testsuite/gdb.opencl/convs_casts.exp +++ b/gdb/testsuite/gdb.opencl/convs_casts.exp @@ -19,7 +19,7 @@ load_lib opencl.exp -require !skip_opencl_tests +require allow_opencl_tests set testfile "convs_casts" set clprogram [remote_download target ${srcdir}/${subdir}/${testfile}.cl] diff --git a/gdb/testsuite/gdb.opencl/datatypes.exp b/gdb/testsuite/gdb.opencl/datatypes.exp index 69d07e7b695..b59567f65e2 100644 --- a/gdb/testsuite/gdb.opencl/datatypes.exp +++ b/gdb/testsuite/gdb.opencl/datatypes.exp @@ -19,7 +19,7 @@ load_lib opencl.exp -require !skip_opencl_tests +require allow_opencl_tests set testfile "datatypes" set clprogram [remote_download target ${srcdir}/${subdir}/${testfile}.cl] diff --git a/gdb/testsuite/gdb.opencl/operators.exp b/gdb/testsuite/gdb.opencl/operators.exp index 31a7ee87873..a70e169112d 100644 --- a/gdb/testsuite/gdb.opencl/operators.exp +++ b/gdb/testsuite/gdb.opencl/operators.exp @@ -19,7 +19,7 @@ load_lib opencl.exp -require !skip_opencl_tests +require allow_opencl_tests set testfile "operators" set clprogram [remote_download target ${srcdir}/${subdir}/${testfile}.cl] diff --git a/gdb/testsuite/gdb.opencl/vec_comps.exp b/gdb/testsuite/gdb.opencl/vec_comps.exp index 1ea2bd9d7ec..4c9f8012b79 100644 --- a/gdb/testsuite/gdb.opencl/vec_comps.exp +++ b/gdb/testsuite/gdb.opencl/vec_comps.exp @@ -19,7 +19,7 @@ load_lib opencl.exp -require !skip_opencl_tests +require allow_opencl_tests set testfile "vec_comps" set clprogram [remote_download target ${srcdir}/${subdir}/${testfile}.cl] diff --git a/gdb/testsuite/lib/opencl.exp b/gdb/testsuite/lib/opencl.exp index 3f1b364fa00..4c66d2a9ecd 100644 --- a/gdb/testsuite/lib/opencl.exp +++ b/gdb/testsuite/lib/opencl.exp @@ -27,13 +27,13 @@ proc gdb_compile_opencl_hostapp {clsource executable options} { return [gdb_compile ${src} ${binfile} "executable" ${options_opencl}] } -# Run a test on the target to check if it supports OpenCL. Return 0 if so, 1 if +# Run a test on the target to check if it supports OpenCL. Return 1 if so, 0 if # it does not. -gdb_caching_proc skip_opencl_tests { +gdb_caching_proc allow_opencl_tests { global srcdir objdir subdir gdb_prompt global inferior_exited_re - set me "skip_opencl_tests" + set me "allow_opencl_tests" # Set up, compile, and execute an OpenCL program. Include the current # process ID in the file name of the executable to prevent conflicts with @@ -46,8 +46,8 @@ gdb_caching_proc skip_opencl_tests { if { [gdb_compile_opencl_hostapp "${clprogram}" "${executable}" "${compile_flags}" ] != "" } { remote_file target delete ${clprogram} - verbose "$me: compiling OpenCL binary failed, returning 1" 2 - return 1 + verbose "$me: compiling OpenCL binary failed, returning 0" 2 + return 0 } # Compilation succeeded so now run it via gdb. @@ -56,15 +56,15 @@ gdb_caching_proc skip_opencl_tests { gdb_expect 30 { -re ".*$inferior_exited_re normally.*${gdb_prompt} $" { verbose -log "\n$me: OpenCL support detected" - set result 0 + set result 1 } -re ".*$inferior_exited_re with code.*${gdb_prompt} $" { verbose -log "\n$me: OpenCL support not detected" - set result 1 + set result 0 } default { verbose -log "\n$me OpenCL support not detected (default case)" - set result 1 + set result 0 } } gdb_exit -- 2.30.2