From ed6511a32895f6af1451adcdd42815adcde7341a Mon Sep 17 00:00:00 2001 From: Jacob Bachmeyer Date: Fri, 26 Mar 2021 22:22:22 -0500 Subject: Remove automatic search for local Expect executable in DejaGnu testsuite This search supported the old Cygnus tree layout, which has been obsolete for a very long time. Anyone still wanting to use a newly-built Expect to run DejaGnu tests can do so by passing EXPECT explicitly on the runtest command line (to use the new Expect only for the library unit tests) or in the environment (which will also cause the runtest launcher script to use it to run the framework). Passing EXPECT in the environment can also be achieved by setting EXPECT on the "make check" command line. This remediates the test failures in PR47385 but does not address the underlying root causes, which will be fixed in the 1.6.4 development phase. --- testsuite/lib/runtest.exp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'testsuite') 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 } -- cgit v1.1