From e981f7c8b877ef9448298660578606e55c3c1f86 Mon Sep 17 00:00:00 2001 From: Martijn Dekker Date: Sun, 10 Jan 2021 20:53:41 +0100 Subject: [PATCH] Regression test tweaks to avoid false fails on Solaris src/cmd/ksh93/tests/path.sh: - Re-export PATH after unsetting it. src/cmd/ksh93/tests/pty.sh: - Increase some delays. --- src/cmd/ksh93/tests/path.sh | 1 + src/cmd/ksh93/tests/pty.sh | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/cmd/ksh93/tests/path.sh b/src/cmd/ksh93/tests/path.sh index 52a6fbf1c..3867add77 100755 --- a/src/cmd/ksh93/tests/path.sh +++ b/src/cmd/ksh93/tests/path.sh @@ -302,6 +302,7 @@ then PATH= fi fi PATH=/dev:$tmp +export PATH x=$(whence rm) typeset foo=$(PATH=/xyz:/abc :) y=$(whence rm) diff --git a/src/cmd/ksh93/tests/pty.sh b/src/cmd/ksh93/tests/pty.sh index 344315e62..015439036 100755 --- a/src/cmd/ksh93/tests/pty.sh +++ b/src/cmd/ksh93/tests/pty.sh @@ -488,7 +488,7 @@ L raw Bourne mode literal tab characters with wide characters disabled # This gets handled by ed_read() in edit.c; it does not expand tab # characters on the command line. -d 10 +d 20 p :test-1: w set +o vi +o emacs p :test-2: @@ -504,7 +504,7 @@ L raw Bourne mode literal tab characters with wide characters enabled # This gets handled by ed_viread() in vi.c (even though vi mode is off); # it expands tab characters to spaces on the command line. -d 10 +d 20 p :test-1: w set +o vi +o emacs p :test-2: @@ -520,7 +520,7 @@ L raw Bourne mode backslash handling # The escaping backslash feature should be disabled in the raw Bourne mode. # This is tested with both erase and kill characters. -d 10 +d 20 p :test-1: w set +o vi +o emacs; stty erase ^H kill ^X p :test-2: @@ -540,7 +540,7 @@ L escaping backslashes in $mode mode # Backslashes should only be escaped if the previous input was a backslash. # Other backslashes stored in the input buffer should be erased normally. -d 10 +d 20 p :test-1: w set -o $mode; stty erase ^H p :test-2: