Commit 56969b72 authored by Per Cederqvist's avatar Per Cederqvist
Browse files

(stty_init): Add "-isig erase ^- kill ^- werase ^-". Remove "-ocrnl"

	which isn't portable to FreeBSD.
(unanchored_expect): Don't leave an unparsed space behind when
	unexpected output appears before a prompt.
parent 00cafdeb
...@@ -53,7 +53,7 @@ set clientport 53262 ...@@ -53,7 +53,7 @@ set clientport 53262
set aux_item_default_conf_file "$top_srcdir/run-support/aux-items.conf" set aux_item_default_conf_file "$top_srcdir/run-support/aux-items.conf"
# Fix the tty settings for minimum impact on the data flow. # Fix the tty settings for minimum impact on the data flow.
set stty_init "-echo -onlcr -ocrnl -istrip" set stty_init "-echo -onlcr -istrip -isig erase ^- kill ^- werase ^-"
# State variables. # State variables.
set line_leader "" set line_leader ""
...@@ -246,8 +246,8 @@ proc unanchored_expect {regex testname} { ...@@ -246,8 +246,8 @@ proc unanchored_expect {regex testname} {
fail "$test (unexpected line '$expect_out(1,string)' waiting for '$regex')" fail "$test (unexpected line '$expect_out(1,string)' waiting for '$regex')"
exp_continue exp_continue
} }
-re "($any*)l2g>" { -re "($any*)l2g> " {
fail "$test (unexpected incomplete line '\$expect_out(1,string)' waiting for '$regex')" fail "$test (unexpected incomplete line '$expect_out(1,string)' waiting for '$regex')"
} }
} }
unset test unset test
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment