From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2126) id 0BADA3858425; Fri, 13 Jan 2023 20:39:31 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0BADA3858425 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1673642371; bh=PkDjp+CxWWlzB0dAg1BiSwSSV4eiTss92tRfu8c3Kfs=; h=From:To:Subject:Date:From; b=gGCloID3KiY03Pi0wD8fhj5HrOhdg2UYOqH6CDCojJfWPqrnk7B8eBnZ47B3VspGA BG19TTZcRYMfJe2Q2QWMDTwYr+DCs/zH+XwxD0vFuuzcgM5NKEnG5uKOtwtHQI+baC Q8jZ9YMV2aKSrYT4BTV2iHpb7GcYy/QLnHrfIs4c= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Tom Tromey To: gdb-cvs@sourceware.org Subject: [binutils-gdb] Rename to allow_hw_watchpoint_multi_tests X-Act-Checkin: binutils-gdb X-Git-Author: Tom Tromey X-Git-Refname: refs/heads/master X-Git-Oldrev: 435d58376aae933ddb8f2a2f55d24dc93c463bf0 X-Git-Newrev: 9bc8ef1d750796d69d38f1822c8dd6df5729a187 Message-Id: <20230113203931.0BADA3858425@sourceware.org> Date: Fri, 13 Jan 2023 20:39:31 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D9bc8ef1d7507= 96d69d38f1822c8dd6df5729a187 commit 9bc8ef1d750796d69d38f1822c8dd6df5729a187 Author: Tom Tromey Date: Sun Jan 8 10:57:35 2023 -0700 Rename to allow_hw_watchpoint_multi_tests =20 This changes skip_hw_watchpoint_multi_tests to invert the sense, and renames it to allow_hw_watchpoint_multi_tests. Diff: --- gdb/testsuite/gdb.base/break-idempotent.exp | 2 +- gdb/testsuite/gdb.base/watchpoint.exp | 2 +- gdb/testsuite/gdb.multi/watchpoint-multi.exp | 2 +- gdb/testsuite/gdb.threads/local-watch-wrong-thread.exp | 2 +- gdb/testsuite/gdb.threads/watchthreads-reorder.exp | 2 +- gdb/testsuite/gdb.threads/watchthreads.exp | 2 +- gdb/testsuite/lib/gdb.exp | 10 +++++----- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/gdb/testsuite/gdb.base/break-idempotent.exp b/gdb/testsuite/gd= b.base/break-idempotent.exp index e967b563dda..4d74bb54a1e 100644 --- a/gdb/testsuite/gdb.base/break-idempotent.exp +++ b/gdb/testsuite/gdb.base/break-idempotent.exp @@ -185,7 +185,7 @@ foreach_with_prefix pie { "nopie" "pie" } { } =20 if {[allow_hw_watchpoint_access_tests] - && ![skip_hw_watchpoint_multi_tests]} { + && [allow_hw_watchpoint_multi_tests]} { test_break $always_inserted "rwatch" test_break $always_inserted "awatch" } diff --git a/gdb/testsuite/gdb.base/watchpoint.exp b/gdb/testsuite/gdb.base= /watchpoint.exp index c47e083d083..5f5e7923c79 100644 --- a/gdb/testsuite/gdb.base/watchpoint.exp +++ b/gdb/testsuite/gdb.base/watchpoint.exp @@ -771,7 +771,7 @@ proc test_inaccessible_watchpoint {} { =20 # This step requires two HW watchpoints. Since some platforms only # have a single one, accept either SW or HW watchpoint in this case. - if {[skip_hw_watchpoint_multi_tests]} { + if {![allow_hw_watchpoint_multi_tests]} { set watchpoint_msg "(Watchpoint|Hardware watchpoint)" } =20 diff --git a/gdb/testsuite/gdb.multi/watchpoint-multi.exp b/gdb/testsuite/g= db.multi/watchpoint-multi.exp index 69996ba88d2..109defa864a 100644 --- a/gdb/testsuite/gdb.multi/watchpoint-multi.exp +++ b/gdb/testsuite/gdb.multi/watchpoint-multi.exp @@ -62,7 +62,7 @@ gdb_breakpoint "marker_exit" =20 gdb_test "inferior 1" "witching to inferior 1 .*" "switch back to inferior= 1" =20 -if [skip_hw_watchpoint_multi_tests] { +if {![allow_hw_watchpoint_multi_tests]} { # On single hardware watchpoint at least test the watchpoint in inferi= or # 2 is not hit. } else { diff --git a/gdb/testsuite/gdb.threads/local-watch-wrong-thread.exp b/gdb/t= estsuite/gdb.threads/local-watch-wrong-thread.exp index 2f627a05980..d58c777cef6 100644 --- a/gdb/testsuite/gdb.threads/local-watch-wrong-thread.exp +++ b/gdb/testsuite/gdb.threads/local-watch-wrong-thread.exp @@ -19,7 +19,7 @@ # thread other than the thread the local watchpoint was set in stops # for a breakpoint. =20 -require !skip_hw_watchpoint_multi_tests +require allow_hw_watchpoint_multi_tests =20 standard_testfile if {[gdb_compile_pthreads \ diff --git a/gdb/testsuite/gdb.threads/watchthreads-reorder.exp b/gdb/tests= uite/gdb.threads/watchthreads-reorder.exp index d5de2c68684..68409eff325 100644 --- a/gdb/testsuite/gdb.threads/watchthreads-reorder.exp +++ b/gdb/testsuite/gdb.threads/watchthreads-reorder.exp @@ -25,7 +25,7 @@ # could be assigned during continuation of a thread with pending SIGTRAP t= o the # different/new watchpoint, just based on the watchpoint/debug register nu= mber. =20 -require allow_hw_watchpoint_access_tests !skip_hw_watchpoint_multi_tests +require allow_hw_watchpoint_access_tests allow_hw_watchpoint_multi_tests if {![istarget *-*-linux*]} { return 0 } diff --git a/gdb/testsuite/gdb.threads/watchthreads.exp b/gdb/testsuite/gdb= .threads/watchthreads.exp index d2a95bf7d5c..1aa7957c867 100644 --- a/gdb/testsuite/gdb.threads/watchthreads.exp +++ b/gdb/testsuite/gdb.threads/watchthreads.exp @@ -20,7 +20,7 @@ =20 # This test verifies that a watchpoint is detected in the proper thread # so the test is only meaningful on a system with hardware watchpoints. -require !skip_hw_watchpoint_multi_tests +require allow_hw_watchpoint_multi_tests =20 proc target_no_stopped_data { } { return [istarget s390*-*-*] diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index 13d1ae881b5..446f89a8a25 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -4064,21 +4064,21 @@ proc skip_hw_watchpoint_tests {} { return 1 } =20 -# Return a 1 if we should skip tests that require *multiple* hardware +# Return a 1 if we should run tests that require *multiple* hardware # watchpoints to be active at the same time =20 -proc skip_hw_watchpoint_multi_tests {} { +proc allow_hw_watchpoint_multi_tests {} { if { [skip_hw_watchpoint_tests] } { - return 1 + return 0 } =20 # These targets support just a single hardware watchpoint if { [istarget "arm*-*-*"] || [istarget "powerpc*-*-linux*"] } { - return 1 + return 0 } =20 - return 0 + return 1 } =20 # Return a 1 if we should run tests that require read/access watchpoints