diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | testsuite/lib/runtest.exp | 8 |
3 files changed, 17 insertions, 2 deletions
@@ -1,3 +1,10 @@ +2021-03-26 Jacob Bachmeyer <jcb@gnu.org> + + PR47385 + + * testsuite/lib/runtest.exp: Remove support for automatically + locating an Expect executable in the old Cygnus tree layout. + 2021-03-25 Jacob Bachmeyer <jcb@gnu.org> PR47382 @@ -53,6 +53,10 @@ Changes since 1.6.2: The Tcl namespace ::dejagnu and all child namespaces are entirely internal and should not be mentioned in testsuite code. Its contents are subject to change without notice, even on point releases. +21. The DejaGnu testsuite no longer searches for a nearby Expect executable + in the location where it would have been located in the old Cygnus tree + layout. If you want to use a special Expect other than the system + Expect, specify EXPECT=/name/of/expect to "runtest" or "make check". Changes since 1.6.1: diff --git a/testsuite/lib/runtest.exp b/testsuite/lib/runtest.exp index bbb541b..4efd0df 100644 --- a/testsuite/lib/runtest.exp +++ b/testsuite/lib/runtest.exp @@ -1,4 +1,4 @@ -# Copyright (C) 1992-2016, 2018, 2020 Free Software Foundation, Inc. +# Copyright (C) 1992-2016, 2018, 2020, 2021 Free Software Foundation, Inc. # # This file is part of DejaGnu. # @@ -23,7 +23,11 @@ if { ![info exists RUNTEST] } { } if { ![info exists EXPECT] } { - set EXPECT [findfile $base_dir/../../expect/expect $base_dir/../../expect/expect expect] + if { [info exists ::env(EXPECT)] } { + set EXPECT $::env(EXPECT) + } else { + set EXPECT expect + } verbose "EXPECT defaulting to $EXPECT" 2 } |