From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id EjYVCaMOBWknkhUAWB0awg (envelope-from ) for ; Fri, 31 Oct 2025 15:31:47 -0400 Authentication-Results: simark.ca; dkim=pass (2048-bit key; secure) header.d=adacore.com header.i=@adacore.com header.a=rsa-sha256 header.s=google header.b=VlxsJ8WX; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 12B1A1E04C; Fri, 31 Oct 2025 15:31:47 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-25) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-2.4 required=5.0 tests=ARC_SIGNED,ARC_VALID,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED,RCVD_IN_VALIDITY_CERTIFIED_BLOCKED, RCVD_IN_VALIDITY_RPBL_BLOCKED,RCVD_IN_VALIDITY_SAFE_BLOCKED autolearn=ham autolearn_force=no version=4.0.1 Received: from server2.sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id 805911E04C for ; Fri, 31 Oct 2025 15:31:45 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id D8BE93850856 for ; Fri, 31 Oct 2025 19:31:44 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D8BE93850856 Authentication-Results: sourceware.org; dkim=pass (2048-bit key, secure) header.d=adacore.com header.i=@adacore.com header.a=rsa-sha256 header.s=google header.b=VlxsJ8WX Received: from mail-io1-xd2d.google.com (mail-io1-xd2d.google.com [IPv6:2607:f8b0:4864:20::d2d]) by sourceware.org (Postfix) with ESMTPS id 0AA7A3860C36 for ; Fri, 31 Oct 2025 19:31:07 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 0AA7A3860C36 Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 0AA7A3860C36 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::d2d ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1761939067; cv=none; b=GzbnpaNBbysTeYLqk44FOtly8EsqlTFDLFPY6UtoA7GBNG4C6++5XoR19dUb+OuxHTTNDoc3QdGUE7MMjazH49jHVBhahNWU40I/yT9Y99wgfa7aXNUZC3e8TKncF7QznJqbKtajUz0fRryB81bwPbJi6VW0baxbS3Ubs/xkEbU= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1761939067; c=relaxed/simple; bh=9gBBNbpoqIYKOwvOvtNBXq4cgYxFs/JlIHWauqQUSxg=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=IhRXft0jtBOSp82WtrRpQZNC1NuahYxydkg1htD2B6Rv1cvyP5wftG5MEl/9XkBk76vPwlAtLYDiW40QoMtRzhrC0m/JvJjg1ew9m5QyWzIKwKrwaFp5OHCN7LCbhYx/tHjtXicJf3fvwOscNNhHixVoym/Y7z5M8/iFWMd7/Is= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0AA7A3860C36 Received: by mail-io1-xd2d.google.com with SMTP id ca18e2360f4ac-9482ba6fc24so53734439f.2 for ; Fri, 31 Oct 2025 12:31:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1761939066; x=1762543866; darn=sourceware.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=LMIds8wJ0ko+2Nh48a7nsCBbrWtogI4qLI4YachMqw8=; b=VlxsJ8WX/CD2nsi+VSt5U9bSg7TiJr95aW4y2d5ryQMCoVNvLCUBtcMkweeDESoJra 5sFfxxZcJiShQXfIa0WWmSOrM/xEqU5ZzX3ZfLwNFr7vq8IhmlMuHCZXxzDvRtdRKfGt ujeAz5BrqNFBejijZzqMX0y9ZztOHcxrZMh64ofU63sfghBGcyhGZoBZJ1Z2m18MX7xd hUVFhg3QaQnwsXziFptvM0q6CzGb4xEl88cKNzr2erz1amE314/u2fACYtLs/q/TJgl4 7Ff5y0uPeWHl0Gs1uqqQerVHP3JXedrkUsG3I51pTT5i+fZ/Uoeles3PgS2Ve4wwuCSe vT4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761939066; x=1762543866; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=LMIds8wJ0ko+2Nh48a7nsCBbrWtogI4qLI4YachMqw8=; b=oqKSQeZkCKBCx63Alragl6saxsvSlEmj1KNYpu9ClIS9HdeX2Paa0xpJfYBMI8o4t3 tMBAZ+pbu81dnmWxCfLYJ3ujwJhYqLBdeWUm0lYOeJlD6Hno/Jf6HCfYsh83NpbVc/yF 3ijmOPkBSIpMxdIcFgRsRrXksJeBlHKjA3P1o58dAIj340pza+JiQlq/YVw9pdiBLeUn TfwmcOf8A/CB+Nq/mnIyt04Rp9AeRnujPfleI8s/4xIT9yh3uGpVLImpnCKmwBDcP6Qp sqJbhLNYpwMMc2lma1FbVNQ6i+S7OgvHJ87EdkbTnxHrQKaTogIRsYRnZF3BMxVkk+RK oIAQ== X-Gm-Message-State: AOJu0YztDmql2sHvhN+wrpIphZqL8ofLpiwYRpz4k8q8TlXGwnGrMLW6 V9zEdTLfTPct6SmQZJNDOFISZWQesdg0bLcolFQi40ELFNyvnV2Rauk7y52Ja9t7i0UfqqiXeGp bc1g= X-Gm-Gg: ASbGncsU+TDccbbv9lxZSaAqWlGzluUN5MeA5AwETrZkZToBXFQ1lfeHeOHcIRR0VBL rnCa4K9TL7xSQOSD59zA4cytSnqz8nNoLrI/rwFWuS06vzaXzRdq/y5BYR6OcGcm7/QXJQOws2+ n9ZFFRbFWRnw8Cc9VOikBa16K2OKynX7dGTOKrkWQ5p1tzuDzFzgeXGWVABUxtw+wPQCgU0B7ZE +sZR6yqqz54OE45ge1cw6p/ZhSefUGQ+++Fkds898t0pBkEVTsO0ug1OXghSD1hfmf6ocft02VO zSnGEC4MoOxJi53lza/X88USW+DNJUsq18rIiWAsPhzYxW24shXaVQwJulGf2gpJxpIxQNFPFlL ABYMWY4yaDIBl7ujjytFQOdkGwq1Ob5YLiVy9rWlI/UOoIbNP9jwH5Ls1OHrbE7Abr/O2ZXvncR hq2xItRwi5uvEfx6BrOkHwzg== X-Google-Smtp-Source: AGHT+IGATEbH3fTUFWmaOSJxCsw00cYoq1jVPnaa9vwXp1cNU5yYP3DdU+Sk2oQgdd055IlJEE9GlA== X-Received: by 2002:a05:6602:2b05:b0:940:d4aa:a34d with SMTP id ca18e2360f4ac-9482291e21fmr788734239f.1.1761939066014; Fri, 31 Oct 2025 12:31:06 -0700 (PDT) Received: from bapiya (97-122-120-205.hlrn.qwest.net. [97.122.120.205]) by smtp.gmail.com with ESMTPSA id ca18e2360f4ac-94827baf909sm83919039f.8.2025.10.31.12.31.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Oct 2025 12:31:05 -0700 (PDT) From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH] Clean up "return -1" in gdb.rust Date: Fri, 31 Oct 2025 13:30:58 -0600 Message-ID: <20251031193102.2661619-1-tromey@adacore.com> X-Mailer: git-send-email 2.51.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces~public-inbox=simark.ca@sourceware.org This changes gdb.rust tests to use plain "return" rather than "return -1". In these spots, the "-1" has no meaning. --- gdb/testsuite/gdb.rust/completion.exp | 4 ++-- gdb/testsuite/gdb.rust/dwindex.exp | 4 ++-- gdb/testsuite/gdb.rust/finish.exp | 4 ++-- gdb/testsuite/gdb.rust/fnfield.exp | 4 ++-- gdb/testsuite/gdb.rust/generics.exp | 4 ++-- gdb/testsuite/gdb.rust/main-crash.exp | 4 ++-- gdb/testsuite/gdb.rust/methods.exp | 4 ++-- gdb/testsuite/gdb.rust/modules.exp | 4 ++-- gdb/testsuite/gdb.rust/onetwoeight.exp | 6 +++--- gdb/testsuite/gdb.rust/pp.exp | 4 ++-- gdb/testsuite/gdb.rust/rawids.exp | 4 ++-- gdb/testsuite/gdb.rust/rust-start.exp | 4 ++-- gdb/testsuite/gdb.rust/rust-style.exp | 4 ++-- gdb/testsuite/gdb.rust/simple.exp | 4 ++-- gdb/testsuite/gdb.rust/traits.exp | 4 ++-- gdb/testsuite/gdb.rust/unicode.exp | 4 ++-- gdb/testsuite/gdb.rust/union.exp | 4 ++-- gdb/testsuite/gdb.rust/unsized.exp | 4 ++-- gdb/testsuite/gdb.rust/unsized2.exp | 4 ++-- gdb/testsuite/gdb.rust/watch.exp | 4 ++-- 20 files changed, 41 insertions(+), 41 deletions(-) diff --git a/gdb/testsuite/gdb.rust/completion.exp b/gdb/testsuite/gdb.rust/completion.exp index eac5a434694..0edd8cbd480 100644 --- a/gdb/testsuite/gdb.rust/completion.exp +++ b/gdb/testsuite/gdb.rust/completion.exp @@ -22,13 +22,13 @@ require {can_compile rust} standard_testfile .rs if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} { - return -1 + return } set line [gdb_get_line_number "set breakpoint here"] if {![runto ${srcfile}:$line]} { untested "could not run to breakpoint" - return -1 + return } with_timeout_factor 2 { diff --git a/gdb/testsuite/gdb.rust/dwindex.exp b/gdb/testsuite/gdb.rust/dwindex.exp index a9e10e132ed..ba656fbc4af 100644 --- a/gdb/testsuite/gdb.rust/dwindex.exp +++ b/gdb/testsuite/gdb.rust/dwindex.exp @@ -22,12 +22,12 @@ require {can_compile rust} standard_testfile .rs if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} { - return -1 + return } if {[ensure_gdb_index $binfile -dwarf-5] == -1} { untested "error adding gdb index" - return -1 + return } gdb_exit diff --git a/gdb/testsuite/gdb.rust/finish.exp b/gdb/testsuite/gdb.rust/finish.exp index 96545fbcc0a..6b941c81470 100644 --- a/gdb/testsuite/gdb.rust/finish.exp +++ b/gdb/testsuite/gdb.rust/finish.exp @@ -21,13 +21,13 @@ require {can_compile rust} standard_testfile .rs if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} { - return -1 + return } set line [gdb_get_line_number "BREAK"] if {![runto ${srcfile}:$line]} { untested "could not run to breakpoint" - return -1 + return } # This 'finish' used to crash. See PR rust/30090. Also, this does diff --git a/gdb/testsuite/gdb.rust/fnfield.exp b/gdb/testsuite/gdb.rust/fnfield.exp index a45ae94f0db..9df8c85192d 100644 --- a/gdb/testsuite/gdb.rust/fnfield.exp +++ b/gdb/testsuite/gdb.rust/fnfield.exp @@ -21,13 +21,13 @@ require {can_compile rust} standard_testfile .rs if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} { - return -1 + return } set line [gdb_get_line_number "set breakpoint here"] if {![runto ${srcfile}:$line]} { untested "could not run to breakpoint" - return -1 + return } gdb_test "print foo.f()" " = 6" "call impl function" diff --git a/gdb/testsuite/gdb.rust/generics.exp b/gdb/testsuite/gdb.rust/generics.exp index d7a34bf84d2..12155796294 100644 --- a/gdb/testsuite/gdb.rust/generics.exp +++ b/gdb/testsuite/gdb.rust/generics.exp @@ -21,13 +21,13 @@ require {can_compile rust} standard_testfile .rs if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} { - return -1 + return } set line [gdb_get_line_number "set breakpoint here"] if {![runto ${srcfile}:$line]} { untested "could not run to breakpoint" - return -1 + return } gdb_test "print identity::(23u32)" " = 23" diff --git a/gdb/testsuite/gdb.rust/main-crash.exp b/gdb/testsuite/gdb.rust/main-crash.exp index 1d246ee8ffb..5a42966fb1a 100644 --- a/gdb/testsuite/gdb.rust/main-crash.exp +++ b/gdb/testsuite/gdb.rust/main-crash.exp @@ -22,14 +22,14 @@ require {can_compile rust} standard_testfile main.rs if {[prepare_for_testing "failed to prepare" $testfile $srcfile \ {debug rust}]} { - return -1 + return } set line [gdb_get_line_number "BREAK"] # The bug was that this would crash. if {![runto ${srcfile}:$line]} { untested "could not run to breakpoint" - return -1 + return } # Test that gdb is alive. diff --git a/gdb/testsuite/gdb.rust/methods.exp b/gdb/testsuite/gdb.rust/methods.exp index 0061b46c9e3..9526ca49319 100644 --- a/gdb/testsuite/gdb.rust/methods.exp +++ b/gdb/testsuite/gdb.rust/methods.exp @@ -21,13 +21,13 @@ require {can_compile rust} standard_testfile .rs if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} { - return -1 + return } set line [gdb_get_line_number "set breakpoint 1 here"] if {![runto ${srcfile}:$line]} { untested "could not run to breakpoint" - return -1 + return } gdb_test "print x" " = methods::HasMethods \\{value: 0\\}" diff --git a/gdb/testsuite/gdb.rust/modules.exp b/gdb/testsuite/gdb.rust/modules.exp index 0874db3056d..426eb4652b7 100644 --- a/gdb/testsuite/gdb.rust/modules.exp +++ b/gdb/testsuite/gdb.rust/modules.exp @@ -21,13 +21,13 @@ require {can_compile rust} standard_testfile .rs if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} { - return -1 + return } set line [gdb_get_line_number "set breakpoint here"] if {![runto ${srcfile}:$line]} { untested "could not run to breakpoint" - return -1 + return } # Currently a closure type is not described by rustc. diff --git a/gdb/testsuite/gdb.rust/onetwoeight.exp b/gdb/testsuite/gdb.rust/onetwoeight.exp index 8ae9d54ec54..e1353c05568 100644 --- a/gdb/testsuite/gdb.rust/onetwoeight.exp +++ b/gdb/testsuite/gdb.rust/onetwoeight.exp @@ -22,18 +22,18 @@ require {can_compile rust} set v [split [rust_compiler_version] .] if {[lindex $v 0] == 1 && [lindex $v 1] < 43} { untested "128-bit ints require rust 1.43 or greater" - return -1 + return } standard_testfile .rs if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} { - return -1 + return } set line [gdb_get_line_number "BREAK"] if {![runto ${srcfile}:$line]} { untested "could not run to breakpoint" - return -1 + return } gdb_test "print x" " = 340282366920938463463374607431768211455" diff --git a/gdb/testsuite/gdb.rust/pp.exp b/gdb/testsuite/gdb.rust/pp.exp index aa989c0552e..e287c3e51f6 100644 --- a/gdb/testsuite/gdb.rust/pp.exp +++ b/gdb/testsuite/gdb.rust/pp.exp @@ -22,7 +22,7 @@ require {can_compile rust} standard_testfile .rs if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} { - return -1 + return } set remote_python_file [gdb_remote_download host \ @@ -32,7 +32,7 @@ gdb_test_no_output "source ${remote_python_file}" "load python file" set line [gdb_get_line_number "set breakpoint here"] if {![runto ${srcfile}:$line]} { untested "could not run to breakpoint" - return -1 + return } gdb_test "print outer" " = pp::Outer \\(x\\(5\\)\\)" diff --git a/gdb/testsuite/gdb.rust/rawids.exp b/gdb/testsuite/gdb.rust/rawids.exp index 9029e2fd5c6..d98b748f8d6 100644 --- a/gdb/testsuite/gdb.rust/rawids.exp +++ b/gdb/testsuite/gdb.rust/rawids.exp @@ -22,13 +22,13 @@ require {rust_at_least 1.30} standard_testfile .rs if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} { - return -1 + return } set line [gdb_get_line_number "set breakpoint here"] if {![runto ${srcfile}:$line]} { untested "could not run to breakpoint" - return -1 + return } gdb_test "print r#if" " = 23" diff --git a/gdb/testsuite/gdb.rust/rust-start.exp b/gdb/testsuite/gdb.rust/rust-start.exp index 1287d83e840..e2429cd04d2 100644 --- a/gdb/testsuite/gdb.rust/rust-start.exp +++ b/gdb/testsuite/gdb.rust/rust-start.exp @@ -25,13 +25,13 @@ require !use_gdb_stub standard_testfile simple.rs if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} { - return -1 + return } # Verify that "start" lands inside the right procedure. if {[gdb_start_cmd] < 0} { unsupported "start failed" - return -1 + return } gdb_test "" \ diff --git a/gdb/testsuite/gdb.rust/rust-style.exp b/gdb/testsuite/gdb.rust/rust-style.exp index ae01ad6d9ee..bbee56447f1 100644 --- a/gdb/testsuite/gdb.rust/rust-style.exp +++ b/gdb/testsuite/gdb.rust/rust-style.exp @@ -23,13 +23,13 @@ with_ansi_styling_terminal { standard_testfile .rs if {[prepare_for_testing "failed to prepare" $testfile $srcfile \ {debug rust}]} { - return -1 + return } set line [gdb_get_line_number "breakpoint"] if {![runto ${srcfile}:$line]} { untested "could not run to breakpoint" - return -1 + return } set vfield [style value variable] diff --git a/gdb/testsuite/gdb.rust/simple.exp b/gdb/testsuite/gdb.rust/simple.exp index a236a30d002..2377e09b893 100644 --- a/gdb/testsuite/gdb.rust/simple.exp +++ b/gdb/testsuite/gdb.rust/simple.exp @@ -21,13 +21,13 @@ require {can_compile rust} standard_testfile .rs if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} { - return -1 + return } set line [gdb_get_line_number "set breakpoint here"] if {![runto ${srcfile}:$line]} { untested "could not run to breakpoint" - return -1 + return } gdb_test "print a" " = \\(\\)" diff --git a/gdb/testsuite/gdb.rust/traits.exp b/gdb/testsuite/gdb.rust/traits.exp index 82fc894febe..50800702d7e 100644 --- a/gdb/testsuite/gdb.rust/traits.exp +++ b/gdb/testsuite/gdb.rust/traits.exp @@ -21,7 +21,7 @@ require {can_compile rust} standard_testfile .rs if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} { - return -1 + return } set readelf_program [gdb_find_readelf] @@ -39,7 +39,7 @@ if {![regexp DW_AT_containing_type $output]} { set line [gdb_get_line_number "set breakpoint here"] if {![runto ${srcfile}:$line]} { untested "could not run to breakpoint" - return -1 + return } gdb_test "print *td" " = 23.5" diff --git a/gdb/testsuite/gdb.rust/unicode.exp b/gdb/testsuite/gdb.rust/unicode.exp index a86e59f69da..ef6818d8f93 100644 --- a/gdb/testsuite/gdb.rust/unicode.exp +++ b/gdb/testsuite/gdb.rust/unicode.exp @@ -28,13 +28,13 @@ setenv LC_ALL C.UTF-8 standard_testfile .rs if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} { - return -1 + return } set line [gdb_get_line_number "set breakpoint here"] if {![runto ${srcfile}:$line]} { untested "could not run to breakpoint" - return -1 + return } gdb_test "print 𝕯" " = 98" "print D" diff --git a/gdb/testsuite/gdb.rust/union.exp b/gdb/testsuite/gdb.rust/union.exp index 55fe6dbd01f..87c28ebeb34 100644 --- a/gdb/testsuite/gdb.rust/union.exp +++ b/gdb/testsuite/gdb.rust/union.exp @@ -21,13 +21,13 @@ require {can_compile rust} standard_testfile .rs if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} { - return -1 + return } set line [gdb_get_line_number "set breakpoint here"] if {![runto ${srcfile}:$line]} { untested "could not run to breakpoint" - return -1 + return } gdb_test "print u" " = union::Union {f1: -1, f2: 255}" diff --git a/gdb/testsuite/gdb.rust/unsized.exp b/gdb/testsuite/gdb.rust/unsized.exp index f91614551d7..95abab50c1b 100644 --- a/gdb/testsuite/gdb.rust/unsized.exp +++ b/gdb/testsuite/gdb.rust/unsized.exp @@ -21,13 +21,13 @@ require {can_compile rust} standard_testfile .rs if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} { - return -1 + return } set line [gdb_get_line_number "set breakpoint here"] if {![runto ${srcfile}:$line]} { untested "could not run to breakpoint" - return -1 + return } gdb_test "ptype us" " = .*V<\\\[u8\\\]>.*" diff --git a/gdb/testsuite/gdb.rust/unsized2.exp b/gdb/testsuite/gdb.rust/unsized2.exp index d4d5ea1915c..85c091c6252 100644 --- a/gdb/testsuite/gdb.rust/unsized2.exp +++ b/gdb/testsuite/gdb.rust/unsized2.exp @@ -22,13 +22,13 @@ require {rust_at_least 1.61} standard_testfile .rs if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} { - return -1 + return } set line [gdb_get_line_number "set breakpoint here"] if {![runto ${srcfile}:$line]} { untested "could not run to breakpoint" - return -1 + return } set base_value \ diff --git a/gdb/testsuite/gdb.rust/watch.exp b/gdb/testsuite/gdb.rust/watch.exp index a90abd761a1..33d7279db56 100644 --- a/gdb/testsuite/gdb.rust/watch.exp +++ b/gdb/testsuite/gdb.rust/watch.exp @@ -21,13 +21,13 @@ require {can_compile rust} standard_testfile .rs if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} { - return -1 + return } set line [gdb_get_line_number "set breakpoint here"] if {![runto ${srcfile}:$line]} { untested "could not run to breakpoint" - return -1 + return } # Just setting a watchpoint was enough to trigger the bug. base-commit: 2f53fb60c9c63c47ed65adeda70194f7984dfbba -- 2.51.0