[binutils-gdb] GDB: testsuite: threads: Don't return value from top-level (manual)

Thiago Bauermann via Gdb-cvs <[email protected]>
Newsgroups gmane.comp.gdb.cvs
Message-ID <[email protected]> 
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=492ab601bb36103673b5aa582d5d45dfb3489a99

commit 492ab601bb36103673b5aa582d5d45dfb3489a99
Author: Thiago Jung Bauermann <[email protected]>
Date:   Wed Apr 29 20:04:25 2026 -0300

    GDB: testsuite: threads: Don't return value from top-level (manual)
    
    This patch manually changes "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 for loops,
      with_test_prefix, foreach_with_prefix, gdb_test_multiple.
    
    I also fixed a couple cases of "return 0" from top-level that also
    weren't caught by sed, and even a couple cases of "return 1" from
    top-level.
    
    Approved-By: Tom Tromey <[email protected]>

Diff:
---
 gdb/testsuite/gdb.threads/attach-slow-waitpid.exp         | 4 ++--
 gdb/testsuite/gdb.threads/corethreads.exp                 | 4 ++--
 gdb/testsuite/gdb.threads/create-fail.exp                 | 2 +-
 gdb/testsuite/gdb.threads/gcore-stale-thread.exp          | 2 +-
 gdb/testsuite/gdb.threads/gcore-thread.exp                | 4 ++--
 gdb/testsuite/gdb.threads/linux-dp.exp                    | 2 +-
 gdb/testsuite/gdb.threads/multiple-successive-infcall.exp | 6 +++---
 gdb/testsuite/gdb.threads/omp-par-scope.exp               | 2 +-
 gdb/testsuite/gdb.threads/omp-task.exp                    | 2 +-
 gdb/testsuite/gdb.threads/siginfo-threads.exp             | 2 +-
 gdb/testsuite/gdb.threads/staticthreads.exp               | 4 ++--
 gdb/testsuite/gdb.threads/stepi-over-clone.exp            | 2 +-
 gdb/testsuite/gdb.threads/thread-specific.exp             | 4 ++--
 gdb/testsuite/gdb.threads/thread_check.exp                | 2 +-
 gdb/testsuite/gdb.threads/tls.exp                         | 4 ++--
 gdb/testsuite/gdb.threads/watchthreads-reorder.exp        | 2 +-
 16 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/gdb/testsuite/gdb.threads/attach-slow-waitpid.exp b/gdb/testsuite/gdb.threads/attach-slow-waitpid.exp
index 343a96bc511..de5a901f0b1 100644
--- a/gdb/testsuite/gdb.threads/attach-slow-waitpid.exp
+++ b/gdb/testsuite/gdb.threads/attach-slow-waitpid.exp
@@ -53,7 +53,7 @@ with_test_prefix "compile preload library" {
     # limit this test to running when ISNATIVE is true.
     if { [gdb_compile_shlib_pthreads \
 	      $libsrc $libobj {debug}] != "" } then {
-	return -1
+	return
     }
 }
 
@@ -62,7 +62,7 @@ with_test_prefix "compile test executable" {
     if { [gdb_compile_pthreads \
 	      "${srcdir}/${subdir}/${srcfile}" "${binfile}" \
 	      executable {debug}] != "" } {
-	return -1
+	return
     }
 }
 
diff --git a/gdb/testsuite/gdb.threads/corethreads.exp b/gdb/testsuite/gdb.threads/corethreads.exp
index 4e520c5e8f2..2ea87962336 100644
--- a/gdb/testsuite/gdb.threads/corethreads.exp
+++ b/gdb/testsuite/gdb.threads/corethreads.exp
@@ -23,8 +23,8 @@ if {![istarget "*-*-linux*"]} {
 standard_testfile
 set executable ${testfile}
 if { [gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     untested "failed to compile"
-     return -1
+    untested "failed to compile"
+    return
 }
 
 set corefile [core_find $binfile]
diff --git a/gdb/testsuite/gdb.threads/create-fail.exp b/gdb/testsuite/gdb.threads/create-fail.exp
index c77ccab17ae..bb7c341a5b5 100644
--- a/gdb/testsuite/gdb.threads/create-fail.exp
+++ b/gdb/testsuite/gdb.threads/create-fail.exp
@@ -34,7 +34,7 @@ for {set i 1} {$i <= $iterations} {incr i} {
 	clean_restart ${executable}
 
 	if {![runto_main]} {
-	    return -1
+	    return
 	}
 
 	set test "run till end"
diff --git a/gdb/testsuite/gdb.threads/gcore-stale-thread.exp b/gdb/testsuite/gdb.threads/gcore-stale-thread.exp
index 9faa2686c76..d0465c87a4a 100644
--- a/gdb/testsuite/gdb.threads/gcore-stale-thread.exp
+++ b/gdb/testsuite/gdb.threads/gcore-stale-thread.exp
@@ -34,7 +34,7 @@ gdb_test_multiple "info threads" "threads are supported" {
     }
     -re "\r\n$gdb_prompt $" {
 	unsupported "gdb does not support threads on this target"
-	return -1
+	return
     }
 }
 
diff --git a/gdb/testsuite/gdb.threads/gcore-thread.exp b/gdb/testsuite/gdb.threads/gcore-thread.exp
index c3b8c56dd4b..1d0150da674 100644
--- a/gdb/testsuite/gdb.threads/gcore-thread.exp
+++ b/gdb/testsuite/gdb.threads/gcore-thread.exp
@@ -65,7 +65,7 @@ gdb_test_multiple "info threads" "threads are supported" {
     }
     -re "${nl}$gdb_prompt $" {
 	unsupported "gdb does not support threads on this target"
-	return -1
+	return
     }
 }
 
@@ -83,7 +83,7 @@ gdb_test "continue" "Continuing.*Breakpoint.* thread2 .*" "thread 2 is running"
 set core_supported [gdb_gcore_cmd "$corefile" "save a corefile"]
 
 if {!$core_supported} {
-  return -1
+    return
 }
 
 
diff --git a/gdb/testsuite/gdb.threads/linux-dp.exp b/gdb/testsuite/gdb.threads/linux-dp.exp
index 42773f2293b..f573964ea6a 100644
--- a/gdb/testsuite/gdb.threads/linux-dp.exp
+++ b/gdb/testsuite/gdb.threads/linux-dp.exp
@@ -99,7 +99,7 @@ for {set i 0} {$i < 5} {incr i} {
 	    # when it first notices that the thread library doesn't support
 	    # debugging, or if we could explicitly ask GDB somehow.
 	    unsupported "this GDB does not support threads on this system."
-	    return -1
+	    return
 	}
 	-re "$gdb_prompt $" {
 	}
diff --git a/gdb/testsuite/gdb.threads/multiple-successive-infcall.exp b/gdb/testsuite/gdb.threads/multiple-successive-infcall.exp
index 8d438673cf0..fdcbaa47c7f 100644
--- a/gdb/testsuite/gdb.threads/multiple-successive-infcall.exp
+++ b/gdb/testsuite/gdb.threads/multiple-successive-infcall.exp
@@ -19,14 +19,14 @@
 standard_testfile
 
 if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" \
-  executable {debug additional_flags=-std=gnu99}] != "" } {
-  return -1
+	 executable {debug additional_flags=-std=gnu99}] != "" } {
+    return
 }
 
 clean_restart "${::testfile}"
 
 if {![runto_main]} {
-   return 0
+    return
 }
 
 # Ensure that each new thread is detected by GDB in the order that the
diff --git a/gdb/testsuite/gdb.threads/omp-par-scope.exp b/gdb/testsuite/gdb.threads/omp-par-scope.exp
index b561bf2f4a5..7d706078b2c 100644
--- a/gdb/testsuite/gdb.threads/omp-par-scope.exp
+++ b/gdb/testsuite/gdb.threads/omp-par-scope.exp
@@ -56,7 +56,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile $opts]} {
 if {[info procs gdb_openmp_setup] != ""} {
     if {[gdb_openmp_setup $binfile] != ""} {
 	untested "could not set up OpenMP environment"
-	return -1
+	return
     }
 }
 
diff --git a/gdb/testsuite/gdb.threads/omp-task.exp b/gdb/testsuite/gdb.threads/omp-task.exp
index 636bcf98915..a7f39933d74 100644
--- a/gdb/testsuite/gdb.threads/omp-task.exp
+++ b/gdb/testsuite/gdb.threads/omp-task.exp
@@ -30,7 +30,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile $opts]} {
 if {[info procs gdb_openmp_setup] != ""} {
     if {[gdb_openmp_setup $binfile] != ""} {
 	untested "could not set up OpenMP environment"
-	return -1
+	return
     }
 }
 
diff --git a/gdb/testsuite/gdb.threads/siginfo-threads.exp b/gdb/testsuite/gdb.threads/siginfo-threads.exp
index acf1185cdfc..6b095ac968a 100644
--- a/gdb/testsuite/gdb.threads/siginfo-threads.exp
+++ b/gdb/testsuite/gdb.threads/siginfo-threads.exp
@@ -62,7 +62,7 @@ for {set sigcount 0} {$sigcount < 4} {incr sigcount} {
 	}
     }
     if {$sigusr == ""} {
-	return -1
+	return
     }
 
     set test "signal $sigcount si_signo"
diff --git a/gdb/testsuite/gdb.threads/staticthreads.exp b/gdb/testsuite/gdb.threads/staticthreads.exp
index bc36d87f7d7..b25c0ae4e3b 100644
--- a/gdb/testsuite/gdb.threads/staticthreads.exp
+++ b/gdb/testsuite/gdb.threads/staticthreads.exp
@@ -30,7 +30,7 @@ foreach_with_prefix have_tls { "-DHAVE_TLS" "" } {
 	break
     }
     if { $have_tls == "" } {
-	return -1
+	return
     }
 }
 
@@ -99,7 +99,7 @@ clean_restart ${::testfile}
 
 if { "$have_tls" != "" } {
     if {![runto_main]} {
-	return -1
+	return
     }
     gdb_breakpoint [gdb_get_line_number "tlsvar-is-set"]
     gdb_continue_to_breakpoint "tlsvar-is-set" ".* tlsvar-is-set .*"
diff --git a/gdb/testsuite/gdb.threads/stepi-over-clone.exp b/gdb/testsuite/gdb.threads/stepi-over-clone.exp
index f59c6275c5d..673d77f0028 100644
--- a/gdb/testsuite/gdb.threads/stepi-over-clone.exp
+++ b/gdb/testsuite/gdb.threads/stepi-over-clone.exp
@@ -85,7 +85,7 @@ gdb_test_multiple "disassemble" "" {
     -re "^End of assembler dump\\.\r\n$gdb_prompt $" {
 	if { [llength $syscall_addrs] == 0 } {
 	    unsupported "no syscalls found"
-	    return -1
+	    return
 	}
     }
 }
diff --git a/gdb/testsuite/gdb.threads/thread-specific.exp b/gdb/testsuite/gdb.threads/thread-specific.exp
index 79932ab9dc1..a5191122b0f 100644
--- a/gdb/testsuite/gdb.threads/thread-specific.exp
+++ b/gdb/testsuite/gdb.threads/thread-specific.exp
@@ -81,8 +81,8 @@ set line [gdb_get_line_number "thread-specific.exp: thread loop"]
 set threads [get_thread_list]
 
 if {[llength $threads] == 0} {
-  # We have already issued a FAIL above.
-  return 1
+    # We have already issued a FAIL above.
+    return
 }
 
 gdb_test {print $_thread} ".* = [lindex $threads 0]" "thread var in main"
diff --git a/gdb/testsuite/gdb.threads/thread_check.exp b/gdb/testsuite/gdb.threads/thread_check.exp
index e48e3d5b3c3..013fd253e9f 100644
--- a/gdb/testsuite/gdb.threads/thread_check.exp
+++ b/gdb/testsuite/gdb.threads/thread_check.exp
@@ -42,7 +42,7 @@ if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executab
 clean_restart ${::testfile}
 
 if {![runto_main]} {
-      return 1
+    return
 }
 
 
diff --git a/gdb/testsuite/gdb.threads/tls.exp b/gdb/testsuite/gdb.threads/tls.exp
index bf48a6f9fc9..96e41eed411 100644
--- a/gdb/testsuite/gdb.threads/tls.exp
+++ b/gdb/testsuite/gdb.threads/tls.exp
@@ -165,7 +165,7 @@ gdb_test_multiple "print a_thread_local" "" {
 }
 
 if {![runto_main]} {
-   return 0
+    return
 }
 
 # Set a breakpoint at the "spin" routine to
@@ -190,7 +190,7 @@ gdb_expect {
 	# This is the first symptom if the gcc and binutils versions
 	# in use support TLS, but the system glibc does not.
 	unsupported "continue to first thread: system does not support TLS"
-	return -1
+	return
     }
     -re ".*$inferior_exited_re normally.*$gdb_prompt $" {
 	fail "continue to first thread: program runaway"
diff --git a/gdb/testsuite/gdb.threads/watchthreads-reorder.exp b/gdb/testsuite/gdb.threads/watchthreads-reorder.exp
index f56661d7a5c..192996b51ca 100644
--- a/gdb/testsuite/gdb.threads/watchthreads-reorder.exp
+++ b/gdb/testsuite/gdb.threads/watchthreads-reorder.exp
@@ -42,7 +42,7 @@ foreach reorder {0 1} { with_test_prefix "reorder$reorder" {
     gdb_test "set can-use-hw-watchpoints 1"
 
     if {![runto_main]} {
-	return -1
+	return
     }
 
     # Use "rwatch" as "watch" would report the watchpoint changed just based on its
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.