From fbdcba42176e9f76c1d9e898347c91abd8b86df1 Mon Sep 17 00:00:00 2001
From: "Maciej W. Rozycki" <macro@embecosm.com>
Date: Tue, 12 Dec 2023 13:09:54 +0000
Subject: Use `test_timeout' consistently across protocols

The `test_timeout' global parameter was added with commit 73db65f53795,
however for the `unix' protocol only and then only in the local case.
Update the remote case of the `unix' protocol, other protocols that use
various timeout sources, and the `qemu' board to take any `test_timeout'
setting into account as appropriate.  Amend the manual accordingly.

	* baseboards/qemu.exp (qemu_load): Respect global `test_timeout'
	setting.
	* config/gdb-comm.exp (gdb_comm_load): Likewise.
	* config/gdb_stub.exp (gdb_stub_load): Likewise.
	* config/sim.exp (sim_load): Likewise.
	* config/unix.exp (unix_load): Likewise, in the remote case.
	* doc/dejagnu.texi (Local configuration file): Update
	accordingly.
---
 baseboards/qemu.exp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'baseboards')

diff --git a/baseboards/qemu.exp b/baseboards/qemu.exp
index 193a759..0cd96bf 100644
--- a/baseboards/qemu.exp
+++ b/baseboards/qemu.exp
@@ -199,7 +199,14 @@ set_board_info rcp_prog /usr/bin/scp
 proc qemu_load { dest prog args } {
     global qemu
     global timeout
-    set ret [local_exec "$qemu $prog" "" "" $timeout]
+    global test_timeout
+
+    set wait_timeout $timeout
+    if {[info exists test_timeout]} {
+	set wait_timeout $test_timeout
+    }
+
+    set ret [local_exec "$qemu $prog" "" "" $wait_timeout]
 
     if { [array size ret] == 0 } {
 	return "pass"
-- 
cgit v1.1