diff options
| author | Jacob Bachmeyer <jcb@gnu.org> | 2024-06-19 21:55:59 -0500 |
|---|---|---|
| committer | Jacob Bachmeyer <jcb@gnu.org> | 2024-06-19 21:55:59 -0500 |
| commit | 42979bd3b90ef3e0004653912423de8589eab0be (patch) | |
| tree | 5047936cce0da52a4a0fb04852f6787c51bc73ab | |
| parent | ca371cf9c48186716d26c8e10d442affaf002c80 (diff) | |
| download | dejagnu-master.zip dejagnu-master.tar.gz dejagnu-master.tar.bz2 | |
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | testsuite/lib/libsup.exp | 4 | ||||
| -rw-r--r-- | testsuite/report-card.all/onetest.exp | 4 | ||||
| -rw-r--r-- | testsuite/report-card.all/passes.exp | 4 |
4 files changed, 20 insertions, 5 deletions
@@ -1,3 +1,16 @@ +2024-06-19 Jacob Bachmeyer <jcb@gnu.org> + + PR71624 + + * testsuite/lib/libsup.exp (start_expect): Remove "-onlret" from + stty_init. While POSIX defines this option, it is not implemented + on Mac OS X 10.5.8 and causes spurious failures on that system. + * testsuite/report-card.all/onetest.exp: Likewise. + + * testsuite/report-card.all/passes.exp: While revising stty_init, + the lack of a similar setting was noticed in this file. Ensure + that "stty -onlcr" is applied to the Expect ptys. + 2024-04-13 Jacob Bachmeyer <jcb@gnu.org> * doc/dejagnu.texi (What is DejaGnu?): Update web site addresses. diff --git a/testsuite/lib/libsup.exp b/testsuite/lib/libsup.exp index 59b3553..afedfe6 100644 --- a/testsuite/lib/libsup.exp +++ b/testsuite/lib/libsup.exp @@ -1,4 +1,4 @@ -# Copyright (C) 1992-2016 Free Software Foundation, Inc. +# Copyright (C) 1992-2016, 2024 Free Software Foundation, Inc. # # This file is part of DejaGnu. # @@ -29,7 +29,7 @@ proc start_expect { } { # can execute library code without DejaGnu # Start expect - set stty_init { -onlcr -onlret } + set stty_init { -onlcr } spawn $EXPECT expect { -re "expect.*> " { diff --git a/testsuite/report-card.all/onetest.exp b/testsuite/report-card.all/onetest.exp index fcebdf7..dcc19dd 100644 --- a/testsuite/report-card.all/onetest.exp +++ b/testsuite/report-card.all/onetest.exp @@ -1,4 +1,4 @@ -# Copyright (C) 2018 Free Software Foundation, Inc. +# Copyright (C) 2018, 2024 Free Software Foundation, Inc. # # This file is part of DejaGnu. # @@ -38,7 +38,7 @@ foreach name $test_names result $test_results { close $fd } -set stty_init { -onlcr -onlret } +set stty_init { -onlcr } spawn /bin/sh -c \ "cd [testsuite file -object -test onetest]\ diff --git a/testsuite/report-card.all/passes.exp b/testsuite/report-card.all/passes.exp index 012e9ac..f450dcc 100644 --- a/testsuite/report-card.all/passes.exp +++ b/testsuite/report-card.all/passes.exp @@ -1,4 +1,4 @@ -# Copyright (C) 2018 Free Software Foundation, Inc. +# Copyright (C) 2018, 2024 Free Software Foundation, Inc. # # This file is part of DejaGnu. # @@ -29,6 +29,8 @@ set result_column_map { set test_results { PASS FAIL KPASS KFAIL XPASS XFAIL UNSUPPORTED UNRESOLVED UNTESTED } +set stty_init { -onlcr } + # each entry: { {mode n} { suffix_tag... } { pass... } { { result name }... } } array unset tuplemap array set tuplemap { |