mi-sym-info.exp: Increase timeout for 114-symbol-info-functions
authorKevin Buettner <kevinb@redhat.com>
Thu, 10 Jun 2021 02:52:08 +0000 (19:52 -0700)
committerKevin Buettner <kevinb@redhat.com>
Fri, 11 Jun 2021 21:57:44 +0000 (14:57 -0700)
Loading libc.so's symbols increased the amount of time needed for
114-symbol-info-function to fetch symbols, causing a timeout during my
testing.  I enclosed the entire block with a "with_timeout_factor 4",
which fixes the problem for me.  (Using 2 also fixed it for me, but it
might not be enough when running this test on slower machines.)

gdb/testsuite/ChangeLog:

* gdb.mi/mi-sym-info.exp (114-symbol-info-function test): Increase
timeout.

gdb/testsuite/ChangeLog
gdb/testsuite/gdb.mi/mi-sym-info.exp

index 5f9db54ad02a6dba8a2764d20bd380ad3334eb09..6cb2ef2acb6a6dad5d1973f91b261bd80510ef39 100644 (file)
@@ -1,3 +1,8 @@
+2021-06-11  Kevin Buettner  <kevinb@redhat.com>
+
+       * gdb.mi/mi-sym-info.exp (114-symbol-info-function test): Increase
+       timeout.
+
 2021-06-11  Kevin Buettner  <kevinb@redhat.com>
 
        * gdb.base/print-symbol-loading.exp (proc test_load_shlib):
index 18f85182a7b1003ffba33557dadad789e2fa57ce..dcd6f7d918769ea759177421d431902b57d783e9 100644 (file)
@@ -123,33 +123,35 @@ gdb_test_multiple $cmd $testname -prompt "${mi_gdb_prompt}$" {
 # (from the symbol table).  There's often so much output output from
 # this command that we overflow expect's buffers, avoid this by
 # fetching the output piece by piece.
-set testname "List all functions"
-set cmd "114-symbol-info-functions --include-nondebug"
-set state 0
-gdb_test_multiple $cmd ${testname} -prompt "${mi_gdb_prompt}$" {
-    -re "114\\^done,symbols=\{" {
-       if { $state == 0 } { set state 1 }
-       exp_continue
-    }
-    -re "debug=\\\[${symtab_re}" {
-       if { $state == 1 } { set state 2 }
-       exp_continue
-    }
-    -re ",${symtab_re}" {
-       exp_continue
-    }
-    -re "\\\],nondebug=\\\[" {
-       if { $state == 2 } { set state 3 }
-       exp_continue
-    }
-    -re "\{address=${qstr},name=${qstr}\}," {
-       exp_continue
-    }
-    -re "\{address=${qstr},name=${qstr}\}\\\]\}\r\n${mi_gdb_prompt}$" {
-       if { $state == 3 } {
-           pass $gdb_test_name
-       } else {
-           fail $gdb_test_name
+with_timeout_factor 4 {
+    set testname "List all functions"
+    set cmd "114-symbol-info-functions --include-nondebug"
+    set state 0
+    gdb_test_multiple $cmd ${testname} -prompt "${mi_gdb_prompt}$" {
+       -re "114\\^done,symbols=\{" {
+           if { $state == 0 } { set state 1 }
+           exp_continue
+       }
+       -re "debug=\\\[${symtab_re}" {
+           if { $state == 1 } { set state 2 }
+           exp_continue
+       }
+       -re ",${symtab_re}" {
+           exp_continue
+       }
+       -re "\\\],nondebug=\\\[" {
+           if { $state == 2 } { set state 3 }
+           exp_continue
+       }
+       -re "\{address=${qstr},name=${qstr}\}," {
+           exp_continue
+       }
+       -re "\{address=${qstr},name=${qstr}\}\\\]\}\r\n${mi_gdb_prompt}$" {
+           if { $state == 3 } {
+               pass $gdb_test_name
+           } else {
+               fail $gdb_test_name
+           }
        }
     }
 }