| Message ID | 20201126162521.GA2154445@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | [committed] libstdc++: Allow dejagnu tool_timeout to be overridden | expand |
diff --git a/libstdc++-v3/testsuite/lib/libstdc++.exp b/libstdc++-v3/testsuite/lib/libstdc++.exp index 9ba4ced48830..bde8cc0cc91f 100644 --- a/libstdc++-v3/testsuite/lib/libstdc++.exp +++ b/libstdc++-v3/testsuite/lib/libstdc++.exp @@ -246,7 +246,10 @@ proc libstdc++_init { testfile } { } # Set the default timeout for v3 tests. - set tool_timeout 600 + # You can override this in ~/.dejagnurc or a .exp file named by $DEJAGNU. + if {![info exists tool_timeout]} { + set tool_timeout 600 + } # Default settings. set cxx [transform "g++"]
This allows the default timeout for libstdc++ tests to be set by the user, either in ~/.dejagnurc or a site.exp file that $DEJAGNU names. libstdc++-v3/ChangeLog: * testsuite/lib/libstdc++.exp (libstdc++_init): Only set tool_timeout if it hasn't been set by the user already. Tested powerpc64le-linux. Committed to trunk. commit 39e837cd7509ca631fdc382128202464063ff56e Author: Jonathan Wakely <jwakely@redhat.com> Date: Thu Nov 26 14:42:09 2020 libstdc++: Allow dejagnu tool_timeout to be overridden This allows the default timeout for libstdc++ tests to be set by the user, either in ~/.dejagnurc or a site.exp file that $DEJAGNU names. libstdc++-v3/ChangeLog: * testsuite/lib/libstdc++.exp (libstdc++_init): Only set tool_timeout if it hasn't been set by the user already.