From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id Scd5IU4E72n/4z0AWB0awg (envelope-from ) for ; Mon, 27 Apr 2026 02:38:06 -0400 Authentication-Results: simark.ca; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=NQotJPJ7; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 840091E0BA; Mon, 27 Apr 2026 02:38:06 -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 vm01.sourceware.org (vm01.sourceware.org [38.145.34.32]) (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 7FA6C1E093 for ; Mon, 27 Apr 2026 02:38:05 -0400 (EDT) Received: from vm01.sourceware.org (localhost [127.0.0.1]) by sourceware.org (Postfix) with ESMTP id 09B854B99F44 for ; Mon, 27 Apr 2026 06:38:05 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 09B854B99F44 Authentication-Results: sourceware.org; dkim=pass (2048-bit key, unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=NQotJPJ7 Received: from mail-dl1-x1234.google.com (mail-dl1-x1234.google.com [IPv6:2607:f8b0:4864:20::1234]) by sourceware.org (Postfix) with ESMTPS id B6E2D4BAE7D8 for ; Mon, 27 Apr 2026 06:36:11 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org B6E2D4BAE7D8 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=linaro.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org B6E2D4BAE7D8 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::1234 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1777271771; cv=none; b=fLVmEN+UesxXMYSFB7M+4N0J9Z+pjXWBw/KoQdrfygIYxkwjtfdWbEFVgq3PJX8mbIRzFVPUImqvo4taIu5n5NNK7VIfsWlHu7tX1MmfgggSzW1AnccLApcqAzipjuNN/lNRtozdr7wQ5JuZwwQgAmZs+va/P7oo5mjNCYy1HME= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1777271771; c=relaxed/simple; bh=gALz7pdnG5tH+sVq6jiYO4Gr0Le7cQtq+/PbyUY/WYw=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=eGM4DQyPk2dTGoQrIS3mrjTBkMjtInGd3DR6vn6IXflXeE4cKTrfrOZvkzX/W4STWAcsMV6gkVbHS0lH4c9eUKOz+EdzRG7kWZ//UWXGrc9rNMSPVY37UaDYI7R/neyRcp6Mg7mQUOpHA1t7rgrWPO4IeIne6BlSshtmuSIYu28= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B6E2D4BAE7D8 Received: by mail-dl1-x1234.google.com with SMTP id a92af1059eb24-12c8ccc7755so9742101c88.0 for ; Sun, 26 Apr 2026 23:36:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1777271771; x=1777876571; darn=sourceware.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=C9dNUJ3ykspZ1p4ioB7Ilu0Z1c4GpKyV5mBfeCVu/W8=; b=NQotJPJ7znsja7cIWEht3y1o9sby3ZOZqYIJ3fFaCaXIJjzIjl2RkG8MA73S3t9Hwp ifoQJAAXJJRP4zOa6AYFx5s2meO5RWtn2PKMkxhwY3ygKFNpbr/5l+ogrkibmH00dnzr Yr0liuBXwIlZbOyiASxXDDLpi1MPwE3Olv7A/BmatPrcB9EUWP9IApt1XBVWFEyVYEzg ztxyrNh0nNOleAY+oO68jZ9DsN/lZIkoshtLkgOoE0ZsiceMPoKAT13e4V2pDO3F7GgW jMcrLioBItUCz9poAahu6Mbyc6RwstB/v/sfFume7CjuIvjEAGUrXcjCXxcjh7pZHr+6 SgWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777271771; x=1777876571; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=C9dNUJ3ykspZ1p4ioB7Ilu0Z1c4GpKyV5mBfeCVu/W8=; b=rbbJsCIov+d37FEfTatO9d7cnY0DbMMb37BRhBylQMCU2at7/bSo1NrlrQa9Ai3ksK 8Qf6qLJ08X5ZOwRk6/EyiJhJMPh83TxPVgMPb8HqIUVwOS5+DHFhm3UAFRu0Px+GVX9H By5b/IZN8J8DL4cWVnmKoHRjaj0oQiC9QOGNA+c6Dk7Y+BdKw7T6vo1E+XzBUJ/oqQdH Ons15QWeYcNsloPlQuRY0z6mT1tJvocF81u8ExSGLg39WbhSlrSxrEqtBdRj+mhS/Zwt JYCmYe2YNqGsP0C9y3G6qA/kKQL1R3vYrutcE2L1mTaRRGmb2Jq+nzW6I9jXKNImxIBF RN+Q== X-Gm-Message-State: AOJu0YxsYBbhcyr4GV/smIN+ZY6uL9/tS/U97XxdVmNOXuK6bmWcyH9+ rHnsYKNob+GBG1PhDykZ7jvlB7WcyjKuvXC142WhJYG22YKMkpePsHlH1zYgPU4A0aIHnUD3Ycy +UkSx X-Gm-Gg: AeBDiesITdQK/540HQauLldxwizGZygAyQbV1P6yWCCr7XKz/LgBMrli+X/aLbDd8CA 9XsX0QALc32DO58rCniASd6dK/jRwQDL5quldoa/TKMlx646VGHyRWKo/w042DuxKXizy/ByMt1 xePbneN3biBRD/Css4AOzj6HlKiHtkQwqsigsQPkrtoFAVeonNH/dvm4BJ1tQ/zPcWcyqpGLihX a6HwzTCbyAzbtMn21fqxLEmptp+KR8PbAmKAHDR0rCFCynYEoZjdeyAYu93dS35HdL67qcSSWzV 5dVgP+SvtOwwrvuuewrSmOA+ygJ1yajL3HUdpa3SMAs858me/2zCvjAzobJkyUsFE8dyHTehOCp +WW3SDV29dBIEPXLlFSRsuhU2SHKgkrRZysLIvFow8MJcmqhEyVxGGcSrHVNaG6WPyEbX2H/koy MtD5EW8Nm2T+0k+o+Qt0PnbAyFLJlriGrgijZug1RnzaNP X-Received: by 2002:a05:7022:6091:b0:12d:b8e5:5ee with SMTP id a92af1059eb24-12db8e50b51mr10781169c88.23.1777271770461; Sun, 26 Apr 2026 23:36:10 -0700 (PDT) Received: from localhost ([2804:14d:7e39:8083:33bc:f32e:9aa5:b915]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-12c919266f6sm43455446c88.1.2026.04.26.23.36.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Apr 2026 23:36:10 -0700 (PDT) From: Thiago Jung Bauermann To: gdb-patches@sourceware.org Subject: [PATCH 17/36] GDB: testsuite: C++: Don't return -1 from top-level (manual) Date: Mon, 27 Apr 2026 03:34:41 -0300 Message-ID: <20260427063500.3847618-18-thiago.bauermann@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260427063500.3847618-1-thiago.bauermann@linaro.org> References: <20260427063500.3847618-1-thiago.bauermann@linaro.org> MIME-Version: 1.0 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 patch manually changes most "return -1" statements that weren't caught by the sed command. These return statements fall into one of these criteria: - misaligned line, which is then fixed by this patch; - return at top level but inside block such as save_vars, with_test_prefix, foreach, gdb_test_multiple. - procedure whose callers don't use the return value; Some weren't changed because they didn't meet the criteria above, or weren't trivial to check. --- gdb/testsuite/gdb.cp/anon-struct.exp | 2 +- gdb/testsuite/gdb.cp/break-f-std-string.exp | 2 +- gdb/testsuite/gdb.cp/converts.exp | 2 +- gdb/testsuite/gdb.cp/cp-relocate.exp | 8 ++++---- gdb/testsuite/gdb.cp/cpsizeof.exp | 2 +- gdb/testsuite/gdb.cp/except-multi-location.exp | 4 ++-- gdb/testsuite/gdb.cp/expand-psymtabs-cxx.exp | 4 ++-- gdb/testsuite/gdb.cp/fpointer.exp | 2 +- gdb/testsuite/gdb.cp/koenig.exp | 2 +- gdb/testsuite/gdb.cp/local-static.exp | 2 +- gdb/testsuite/gdb.cp/method2.exp | 2 +- gdb/testsuite/gdb.cp/nsnested.exp | 2 +- gdb/testsuite/gdb.cp/nsnoimports.exp | 2 +- gdb/testsuite/gdb.cp/oranking.exp | 2 +- gdb/testsuite/gdb.cp/pr10728.exp | 12 ++++++------ gdb/testsuite/gdb.cp/rvalue-ref-sizeof.exp | 2 +- gdb/testsuite/gdb.cp/save-bp-qualified.exp | 4 ++-- gdb/testsuite/gdb.cp/smartp.exp | 2 +- gdb/testsuite/gdb.cp/step-and-next-inline.exp | 2 +- 19 files changed, 30 insertions(+), 30 deletions(-) diff --git a/gdb/testsuite/gdb.cp/anon-struct.exp b/gdb/testsuite/gdb.cp/anon-struct.exp index e420d75207fd..10b7ce6c7766 100644 --- a/gdb/testsuite/gdb.cp/anon-struct.exp +++ b/gdb/testsuite/gdb.cp/anon-struct.exp @@ -20,7 +20,7 @@ standard_testfile .cc if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug c++}] } { - return -1 + return } # Clang doesn't add any names for functions within anonymous structures, diff --git a/gdb/testsuite/gdb.cp/break-f-std-string.exp b/gdb/testsuite/gdb.cp/break-f-std-string.exp index 330dfb24468f..4daca7ea0db0 100644 --- a/gdb/testsuite/gdb.cp/break-f-std-string.exp +++ b/gdb/testsuite/gdb.cp/break-f-std-string.exp @@ -71,7 +71,7 @@ proc test {cxx11_abi} { "${srcdir}/${subdir}/${srcfile}" "${binfile}-${cxx11_abi}.o" \ object $options] != "" } { untested "failed to compile" - return -1 + return } clean_restart ${testfile}-${cxx11_abi}.o diff --git a/gdb/testsuite/gdb.cp/converts.exp b/gdb/testsuite/gdb.cp/converts.exp index 7d26db9f3022..60a732f87ee0 100644 --- a/gdb/testsuite/gdb.cp/converts.exp +++ b/gdb/testsuite/gdb.cp/converts.exp @@ -16,7 +16,7 @@ standard_testfile .cc if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug c++}] } { - return -1 + return } ############################################ diff --git a/gdb/testsuite/gdb.cp/cp-relocate.exp b/gdb/testsuite/gdb.cp/cp-relocate.exp index c42c67a95e75..67a9f21b9646 100644 --- a/gdb/testsuite/gdb.cp/cp-relocate.exp +++ b/gdb/testsuite/gdb.cp/cp-relocate.exp @@ -21,8 +21,8 @@ append binfile .o require allow_cplus_tests if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" object {c++ debug}] != "" } { - untested "failed to compile" - return -1 + untested "failed to compile" + return } proc get_func_address { func } { @@ -67,7 +67,7 @@ gdb_test_multiple "info functions func<.>" "info functions" { pass "info functions" } else { fail "info functions" - return -1 + return } } } @@ -105,7 +105,7 @@ gdb_test_multiple "info file" "info file" { pass "info file" } else { fail "info file" - return -1 + return } } } diff --git a/gdb/testsuite/gdb.cp/cpsizeof.exp b/gdb/testsuite/gdb.cp/cpsizeof.exp index a43ae6431acf..239811855791 100644 --- a/gdb/testsuite/gdb.cp/cpsizeof.exp +++ b/gdb/testsuite/gdb.cp/cpsizeof.exp @@ -19,7 +19,7 @@ standard_testfile .cc require allow_cplus_tests if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}] } { - return -1 + return } if {![runto_main]} { diff --git a/gdb/testsuite/gdb.cp/except-multi-location.exp b/gdb/testsuite/gdb.cp/except-multi-location.exp index 88a847b3ab72..52bc7c7dc964 100644 --- a/gdb/testsuite/gdb.cp/except-multi-location.exp +++ b/gdb/testsuite/gdb.cp/except-multi-location.exp @@ -49,7 +49,7 @@ proc test_multi_libstdcpp {static_bin static_lib} { if { [gdb_compile_shlib ${srcfile_lib} ${binfile_lib} $lib_flags] != "" || [gdb_compile ${srcfile} ${binfile} executable $bin_flags] != "" } { untested "failed to compile" - return -1 + return } clean_restart @@ -58,7 +58,7 @@ proc test_multi_libstdcpp {static_bin static_lib} { gdb_load_shlib $binfile_lib if {![runto_main]} { - return 0 + return } gdb_test "catch catch" "Catchpoint ${::decimal} \\(catch\\)" diff --git a/gdb/testsuite/gdb.cp/expand-psymtabs-cxx.exp b/gdb/testsuite/gdb.cp/expand-psymtabs-cxx.exp index 110970c89b8b..e0d34c86a11d 100644 --- a/gdb/testsuite/gdb.cp/expand-psymtabs-cxx.exp +++ b/gdb/testsuite/gdb.cp/expand-psymtabs-cxx.exp @@ -19,8 +19,8 @@ standard_testfile .cc set executable ${testfile} if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" object {debug c++} ] != "" } { - untested "failed to compile" - return -1 + untested "failed to compile" + return } clean_restart ${executable} diff --git a/gdb/testsuite/gdb.cp/fpointer.exp b/gdb/testsuite/gdb.cp/fpointer.exp index a97eef7e55b6..f4f69a0532d6 100644 --- a/gdb/testsuite/gdb.cp/fpointer.exp +++ b/gdb/testsuite/gdb.cp/fpointer.exp @@ -19,7 +19,7 @@ standard_testfile .cc if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug c++}] } { - return -1 + return } if {![runto_main]} { diff --git a/gdb/testsuite/gdb.cp/koenig.exp b/gdb/testsuite/gdb.cp/koenig.exp index 474c4a95b41e..4fd755ad7b7c 100644 --- a/gdb/testsuite/gdb.cp/koenig.exp +++ b/gdb/testsuite/gdb.cp/koenig.exp @@ -22,7 +22,7 @@ lappend opts additional_flags=-Wno-unused-comparison lappend opts additional_flags=-std=c++11 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} $opts] } { - return -1 + return } ############################################ diff --git a/gdb/testsuite/gdb.cp/local-static.exp b/gdb/testsuite/gdb.cp/local-static.exp index a60412856b1f..9b33dc53ba0b 100644 --- a/gdb/testsuite/gdb.cp/local-static.exp +++ b/gdb/testsuite/gdb.cp/local-static.exp @@ -148,7 +148,7 @@ proc do_test {lang} { if {[prepare_for_testing "failed to prepare" $testfile-$lang \ [list $src] $options]} { - return -1 + return } if {![runto_main]} { diff --git a/gdb/testsuite/gdb.cp/method2.exp b/gdb/testsuite/gdb.cp/method2.exp index 4eed2197c36c..e64853ab7ae8 100644 --- a/gdb/testsuite/gdb.cp/method2.exp +++ b/gdb/testsuite/gdb.cp/method2.exp @@ -23,7 +23,7 @@ require allow_cplus_tests standard_testfile .cc if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { - return -1 + return } if {![runto_main]} { diff --git a/gdb/testsuite/gdb.cp/nsnested.exp b/gdb/testsuite/gdb.cp/nsnested.exp index 8c1cef585a8d..11b326fa9b9c 100644 --- a/gdb/testsuite/gdb.cp/nsnested.exp +++ b/gdb/testsuite/gdb.cp/nsnested.exp @@ -16,7 +16,7 @@ standard_testfile .cc if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug c++}] } { - return -1 + return } ############################################ diff --git a/gdb/testsuite/gdb.cp/nsnoimports.exp b/gdb/testsuite/gdb.cp/nsnoimports.exp index 3077e447c285..7c9e70ac3bf1 100644 --- a/gdb/testsuite/gdb.cp/nsnoimports.exp +++ b/gdb/testsuite/gdb.cp/nsnoimports.exp @@ -16,7 +16,7 @@ standard_testfile .cc if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug c++}] } { - return -1 + return } ############################################ diff --git a/gdb/testsuite/gdb.cp/oranking.exp b/gdb/testsuite/gdb.cp/oranking.exp index f7a2f4636227..1f418a96a7db 100644 --- a/gdb/testsuite/gdb.cp/oranking.exp +++ b/gdb/testsuite/gdb.cp/oranking.exp @@ -16,7 +16,7 @@ standard_testfile .cc if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug c++}] } { - return -1 + return } ############################################ diff --git a/gdb/testsuite/gdb.cp/pr10728.exp b/gdb/testsuite/gdb.cp/pr10728.exp index 0625d243bd8f..2560325ae727 100644 --- a/gdb/testsuite/gdb.cp/pr10728.exp +++ b/gdb/testsuite/gdb.cp/pr10728.exp @@ -28,18 +28,18 @@ set tfx [standard_output_file pr10728-x.o] set tfy [standard_output_file pr10728-y.o] if { [gdb_compile "${srcdir}/${subdir}/$srcfile2" "${tfy}.o" object {c++}] != "" } { - untested "failed to compile second object file" - return -1 + untested "failed to compile second object file" + return } if { [gdb_compile "${srcdir}/${subdir}/$srcfile" "${tfx}.o" object {debug c++}] != "" } { - untested "failed to compile first object file" - return -1 + untested "failed to compile first object file" + return } if { [gdb_compile "${tfx}.o ${tfy}.o" ${binfile} executable {debug c++}] != "" } { - untested "failed to compile" - return -1 + untested "failed to compile" + return } clean_restart $::testfile diff --git a/gdb/testsuite/gdb.cp/rvalue-ref-sizeof.exp b/gdb/testsuite/gdb.cp/rvalue-ref-sizeof.exp index a21485e215cb..ed15018b37ff 100644 --- a/gdb/testsuite/gdb.cp/rvalue-ref-sizeof.exp +++ b/gdb/testsuite/gdb.cp/rvalue-ref-sizeof.exp @@ -22,7 +22,7 @@ require allow_cplus_tests if {[prepare_for_testing ${testfile}.exp $testfile $srcfile \ {debug c++ additional_flags="-std=gnu++11"}] } { - return -1 + return } if {![runto_main]} { diff --git a/gdb/testsuite/gdb.cp/save-bp-qualified.exp b/gdb/testsuite/gdb.cp/save-bp-qualified.exp index a6851ba96623..345290276628 100644 --- a/gdb/testsuite/gdb.cp/save-bp-qualified.exp +++ b/gdb/testsuite/gdb.cp/save-bp-qualified.exp @@ -38,7 +38,7 @@ proc restart {} { with_test_prefix "save" { if {![restart]} { - return -1 + return } gdb_breakpoint "function" qualified @@ -56,7 +56,7 @@ with_test_prefix "save" { with_test_prefix "restore" { if {![restart]} { - return -1 + return } # Restore the breakpoints. diff --git a/gdb/testsuite/gdb.cp/smartp.exp b/gdb/testsuite/gdb.cp/smartp.exp index 8a79f4385a9c..4c04a465e475 100644 --- a/gdb/testsuite/gdb.cp/smartp.exp +++ b/gdb/testsuite/gdb.cp/smartp.exp @@ -16,7 +16,7 @@ standard_testfile .cc if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug c++}] } { - return -1 + return } ############################################ diff --git a/gdb/testsuite/gdb.cp/step-and-next-inline.exp b/gdb/testsuite/gdb.cp/step-and-next-inline.exp index e8bb998231b4..d57cbc5a5b47 100644 --- a/gdb/testsuite/gdb.cp/step-and-next-inline.exp +++ b/gdb/testsuite/gdb.cp/step-and-next-inline.exp @@ -41,7 +41,7 @@ proc do_test { use_header } { if { [prepare_for_testing "failed to prepare" $executable \ $srcfile $options] } { - return -1 + return } with_test_prefix $prefix {