From: anton <anton@openbsd.org>
Date: Wed, 5 Jul 2017 19:40:58 +0000 (+0000)
Subject: Favor a UID-agnostic prompt in ksh edit mode tests. Allows the tests to pass
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=c060366783aba728d4e55225317421ed9b290a37;p=openbsd

Favor a UID-agnostic prompt in ksh edit mode tests. Allows the tests to pass
when executed as root.

Spotted by bluhm@
---

diff --git a/regress/bin/ksh/edit/emacs.sh b/regress/bin/ksh/edit/emacs.sh
index 60dbbce9457..22c64dd33dd 100644
--- a/regress/bin/ksh/edit/emacs.sh
+++ b/regress/bin/ksh/edit/emacs.sh
@@ -24,70 +24,70 @@ ENV=
 HISTFILE=
 MAIL=
 MALLOC_OPTIONS=S
-PS1=' $ '
+PS1=' # '
 VISUAL=emacs
 export EDITOR ENV HISTFILE MAIL MALLOC_OPTIONS PS1 VISUAL
 
 # auto-insert
-testseq "abc" " $ abc"
+testseq "abc" " # abc"
 
 # insertion of valid UTF-8
-testseq "z\0002\0302\0200" " $ z\b\0302\0200z\b"
-testseq "z\0002\0337\0277" " $ z\b\0337\0277z\b"
-testseq "z\0002\0340\0240\0200" " $ z\b\0340\0240\0200z\b"
-testseq "z\0002\0354\0277\0277" " $ z\b\0354\0277\0277z\b"
-testseq "z\0002\0355\0200\0200" " $ z\b\0355\0200\0200z\b"
-testseq "z\0002\0355\0237\0277" " $ z\b\0355\0237\0277z\b"
-testseq "z\0002\0356\0200\0200" " $ z\b\0356\0200\0200z\b"
-testseq "z\0002\0357\0277\0277" " $ z\b\0357\0277\0277z\b"
-testseq "z\0002\0364\0200\0200\0200" " $ z\b\0364\0200\0200\0200z\b"
-testseq "z\0002\0364\0217\0277\0277" " $ z\b\0364\0217\0277\0277z\b"
+testseq "z\0002\0302\0200" " # z\b\0302\0200z\b"
+testseq "z\0002\0337\0277" " # z\b\0337\0277z\b"
+testseq "z\0002\0340\0240\0200" " # z\b\0340\0240\0200z\b"
+testseq "z\0002\0354\0277\0277" " # z\b\0354\0277\0277z\b"
+testseq "z\0002\0355\0200\0200" " # z\b\0355\0200\0200z\b"
+testseq "z\0002\0355\0237\0277" " # z\b\0355\0237\0277z\b"
+testseq "z\0002\0356\0200\0200" " # z\b\0356\0200\0200z\b"
+testseq "z\0002\0357\0277\0277" " # z\b\0357\0277\0277z\b"
+testseq "z\0002\0364\0200\0200\0200" " # z\b\0364\0200\0200\0200z\b"
+testseq "z\0002\0364\0217\0277\0277" " # z\b\0364\0217\0277\0277z\b"
 
 # insertion of incomplete UTF-8
-testseq "z\0002\0302\0006" " $ z\b\0302z\bz"
-testseq "z\0002\0377\0006" " $ z\b\0377z\bz"
-testseq "z\0002\0337\0006" " $ z\b\0337z\bz"
-testseq "z\0002\0340\0006" " $ z\b\0340z\bz"
-testseq "z\0002\0357\0006" " $ z\b\0357z\bz"
-testseq "z\0002\0364\0006" " $ z\b\0364z\bz"
-testseq "z\0002\0340\0240\0006" " $ z\b\0340\0240z\bz"
-testseq "z\0002\0354\0277\0006" " $ z\b\0354\0277z\bz"
-testseq "z\0002\0355\0200\0006" " $ z\b\0355\0200z\bz"
-testseq "z\0002\0355\0237\0006" " $ z\b\0355\0237z\bz"
-testseq "z\0002\0356\0200\0006" " $ z\b\0356\0200z\bz"
-testseq "z\0002\0357\0277\0006" " $ z\b\0357\0277z\bz"
-testseq "z\0002\0364\0200\0200\0006" " $ z\b\0364\0200\0200z\bz"
-testseq "z\0002\0364\0217\0277\0006" " $ z\b\0364\0217\0277z\bz"
+testseq "z\0002\0302\0006" " # z\b\0302z\bz"
+testseq "z\0002\0377\0006" " # z\b\0377z\bz"
+testseq "z\0002\0337\0006" " # z\b\0337z\bz"
+testseq "z\0002\0340\0006" " # z\b\0340z\bz"
+testseq "z\0002\0357\0006" " # z\b\0357z\bz"
+testseq "z\0002\0364\0006" " # z\b\0364z\bz"
+testseq "z\0002\0340\0240\0006" " # z\b\0340\0240z\bz"
+testseq "z\0002\0354\0277\0006" " # z\b\0354\0277z\bz"
+testseq "z\0002\0355\0200\0006" " # z\b\0355\0200z\bz"
+testseq "z\0002\0355\0237\0006" " # z\b\0355\0237z\bz"
+testseq "z\0002\0356\0200\0006" " # z\b\0356\0200z\bz"
+testseq "z\0002\0357\0277\0006" " # z\b\0357\0277z\bz"
+testseq "z\0002\0364\0200\0200\0006" " # z\b\0364\0200\0200z\bz"
+testseq "z\0002\0364\0217\0277\0006" " # z\b\0364\0217\0277z\bz"
 
 # insertion of invalid bytes
-testseq "z\0002\0300\0277" " $ z\b\0300z\b\b\0300\0277z\b"
-testseq "z\0002\0301\0277" " $ z\b\0301z\b\b\0301\0277z\b"
-testseq "z\0002\0360\0217" " $ z\b\0360z\b\b\0360\0217z\b"
-testseq "z\0002\0363\0217" " $ z\b\0363z\b\b\0363\0217z\b"
-testseq "z\0002\0365\0217" " $ z\b\0365z\b\b\0365\0217z\b"
-testseq "z\0002\0367\0217" " $ z\b\0367z\b\b\0367\0217z\b"
-testseq "z\0002\0370\0217" " $ z\b\0370z\b\b\0370\0217z\b"
-testseq "z\0002\0377\0217" " $ z\b\0377z\b\b\0377\0217z\b"
+testseq "z\0002\0300\0277" " # z\b\0300z\b\b\0300\0277z\b"
+testseq "z\0002\0301\0277" " # z\b\0301z\b\b\0301\0277z\b"
+testseq "z\0002\0360\0217" " # z\b\0360z\b\b\0360\0217z\b"
+testseq "z\0002\0363\0217" " # z\b\0363z\b\b\0363\0217z\b"
+testseq "z\0002\0365\0217" " # z\b\0365z\b\b\0365\0217z\b"
+testseq "z\0002\0367\0217" " # z\b\0367z\b\b\0367\0217z\b"
+testseq "z\0002\0370\0217" " # z\b\0370z\b\b\0370\0217z\b"
+testseq "z\0002\0377\0217" " # z\b\0377z\b\b\0377\0217z\b"
 
 # insertion of excessively long encodings
 testseq "z\0002\0340\0200\0200" \
-	" $ z\b\0340z\b\b\0340\0200z\b\b\0340\0200\0200z\b"
+	" # z\b\0340z\b\b\0340\0200z\b\b\0340\0200\0200z\b"
 testseq "z\0002\0340\0201\0277" \
-	" $ z\b\0340z\b\b\0340\0201z\b\b\0340\0201\0277z\b"
+	" # z\b\0340z\b\b\0340\0201z\b\b\0340\0201\0277z\b"
 testseq "z\0002\0340\0202\0200" \
-	" $ z\b\0340z\b\b\0340\0202z\b\b\0340\0202\0200z\b"
+	" # z\b\0340z\b\b\0340\0202z\b\b\0340\0202\0200z\b"
 testseq "z\0002\0340\0237\0277" \
-	" $ z\b\0340z\b\b\0340\0237z\b\b\0340\0237\0277z\b"
+	" # z\b\0340z\b\b\0340\0237z\b\b\0340\0237\0277z\b"
 
 # insertion of surrogates and execessive code points
 testseq "z\0002\0355\0240\0200" \
-	" $ z\b\0355z\b\b\0355\0240z\b\b\0355\0240\0200z\b"
+	" # z\b\0355z\b\b\0355\0240z\b\b\0355\0240\0200z\b"
 testseq "z\0002\0355\0277\0277" \
-	" $ z\b\0355z\b\b\0355\0277z\b\b\0355\0277\0277z\b"
+	" # z\b\0355z\b\b\0355\0277z\b\b\0355\0277\0277z\b"
 testseq "z\0002\0364\0220\0200\0200" \
-  " $ z\b\0364z\b\b\0364\0220z\b\b\0364\0220\0200z\b\b\0364\0220\0200\0200z\b"
+  " # z\b\0364z\b\b\0364\0220z\b\b\0364\0220\0200z\b\b\0364\0220\0200\0200z\b"
 testseq "z\0002\0364\0277\0277\0277" \
-  " $ z\b\0364z\b\b\0364\0277z\b\b\0364\0277\0277z\b\b\0364\0277\0277\0277z\b"
+  " # z\b\0364z\b\b\0364\0277z\b\b\0364\0277\0277z\b\b\0364\0277\0277\0277z\b"
 
 # insertion of unmatched meta sequence
-testseq "z\0002\0033[3z" " $ z\b\0007"
+testseq "z\0002\0033[3z" " # z\b\0007"
diff --git a/regress/bin/ksh/edit/vi.sh b/regress/bin/ksh/edit/vi.sh
index 2b2505115d6..6c7a1904ad8 100644
--- a/regress/bin/ksh/edit/vi.sh
+++ b/regress/bin/ksh/edit/vi.sh
@@ -24,159 +24,159 @@ ENV=
 HISTFILE=
 MAIL=
 MALLOC_OPTIONS=S
-PS1=' $ '
+PS1=' # '
 VISUAL=vi
 export EDITOR ENV HISTFILE MAIL MALLOC_OPTIONS PS1 VISUAL
 
 # ^H, ^?: Erase.
-testseq "ab\bc" " $ ab\b \bc"
-testseq "ab\0177c" " $ ab\b \bc"
+testseq "ab\bc" " # ab\b \bc"
+testseq "ab\0177c" " # ab\b \bc"
 
 # ^J, ^M: End of line.
-testseq "echo a\nb" " $ echo a\r\r\na\r\n $ b"
-testseq "echo a\rb" " $ echo a\r\r\na\r\n $ b"
-testseq "echo a\0033\nb" " $ echo a\b\r\r\na\r\n $ b"
-testseq "echo a\0033\rb" " $ echo a\b\r\r\na\r\n $ b"
+testseq "echo a\nb" " # echo a\r\r\na\r\n # b"
+testseq "echo a\rb" " # echo a\r\r\na\r\n # b"
+testseq "echo a\0033\nb" " # echo a\b\r\r\na\r\n # b"
+testseq "echo a\0033\rb" " # echo a\b\r\r\na\r\n # b"
 
 # ^U: Kill.
-testseq "ab\0033ic\0025d" " $ ab\bcb\b\b\bb  \b\b\bdb\b"
+testseq "ab\0033ic\0025d" " # ab\bcb\b\b\bb  \b\b\bdb\b"
 
 # ^V: Literal next.
-testseq "a\0026\0033b" " $ a^\b^[b"
+testseq "a\0026\0033b" " # a^\b^[b"
 
 # ^W: Word erase.
-testseq "one two\0027rep" " $ one two\b\b\b   \b\b\brep"
+testseq "one two\0027rep" " # one two\b\b\b   \b\b\brep"
 
 # A: Append at end of line.
 # 0: Move to column 0.
-testseq "one\00330A two" " $ one\b\b\bone two"
-testseq "one\003302A two\0033" " $ one\b\b\bone two two\b"
+testseq "one\00330A two" " # one\b\b\bone two"
+testseq "one\003302A two\0033" " # one\b\b\bone two two\b"
 
 # a: Append.
 # .: Redo.
-testseq "ab\00330axy" " $ ab\b\baxb\byb\b"
-testseq "ab\003302axy\0033" " $ ab\b\baxb\byb\bxyb\b\b"
-testseq "ab\00330axy\0033." " $ ab\b\baxb\byb\b\byxyb\b\b"
+testseq "ab\00330axy" " # ab\b\baxb\byb\b"
+testseq "ab\003302axy\0033" " # ab\b\baxb\byb\bxyb\b\b"
+testseq "ab\00330axy\0033." " # ab\b\baxb\byb\b\byxyb\b\b"
 
 # B: Move back big word.
-testseq "one 2.0\0033BD" " $ one 2.0\b\b\b   \b\b\b\b"
+testseq "one 2.0\0033BD" " # one 2.0\b\b\b   \b\b\b\b"
 
 # b: Move back word.
 # C: Change to end of line.
 # D: Delete to end of line.
 testseq "one ab.cd\0033bDa.\00332bD" \
-	" $ one ab.cd\b\b  \b\b\b..\b\b\b\b    \b\b\b\b\b"
-testseq "one two\0033bCrep" " $ one two\b\b\b   \b\b\brep"
+	" # one ab.cd\b\b  \b\b\b..\b\b\b\b    \b\b\b\b\b"
+testseq "one two\0033bCrep" " # one two\b\b\b   \b\b\brep"
 
 # c: Change region.
-testseq "one two\0033cbrep" " $ one two\b\b\bo  \b\b\bro\beo\bpo\b"
-testseq "one two\00332chx" " $ one two\b\b\bo  \b\b\bxo\b"
+testseq "one two\0033cbrep" " # one two\b\b\bo  \b\b\bro\beo\bpo\b"
+testseq "one two\00332chx" " # one two\b\b\bo  \b\b\bxo\b"
 
 # d: Delete region.
-testseq "one two\0033db" " $ one two\b\b\bo  \b\b\b"
-testseq "one two xy\00332db" " $ one two xy\b\b\b\b\b\by     \b\b\b\b\b\b"
+testseq "one two\0033db" " # one two\b\b\bo  \b\b\b"
+testseq "one two xy\00332db" " # one two xy\b\b\b\b\b\by     \b\b\b\b\b\b"
 
 # E: Move to end of big word.
-testseq "1.00 two\00330ED" " $ 1.00 two\b\r $ 1.0     \b\b\b\b\b\b"
+testseq "1.00 two\00330ED" " # 1.00 two\b\r # 1.0     \b\b\b\b\b\b"
 
 # e: Move to end of word.
-testseq "onex two\00330eD" " $ onex two\b\r $ one     \b\b\b\b\b\b"
+testseq "onex two\00330eD" " # onex two\b\r # one     \b\b\b\b\b\b"
 
 # F: Find character backward.
 # ;: Repeat last search.
 # ,: Repeat last search in opposite direction.
-testseq "hello\00332FlD" " $ hello\b\b\b   \b\b\b\b"
-testseq "hello\0033Flix\0033;ix" " $ hello\b\bxlo\b\b\b\bxlxlo\b\b\b\b"
-testseq "hello\00332Flix\00332,ix" " $ hello\b\b\bxllo\b\b\b\bxlxlo\b\b"
+testseq "hello\00332FlD" " # hello\b\b\b   \b\b\b\b"
+testseq "hello\0033Flix\0033;ix" " # hello\b\bxlo\b\b\b\bxlxlo\b\b\b\b"
+testseq "hello\00332Flix\00332,ix" " # hello\b\b\bxllo\b\b\b\bxlxlo\b\b"
 
 # f: Find character forward.
-testseq "hello\003302flD" " $ hello\b\b\b\b\bhel  \b\b\b"
+testseq "hello\003302flD" " # hello\b\b\b\b\bhel  \b\b\b"
 
 # h, ^H: Move left.
 # i: Insert.
-testseq "hello\00332hix" " $ hello\b\b\bxllo\b\b\b"
-testseq "hello\00332\b2ix\0033" " $ hello\b\b\bxllo\b\b\bxllo\b\b\b\b"
+testseq "hello\00332hix" " # hello\b\b\bxllo\b\b\b"
+testseq "hello\00332\b2ix\0033" " # hello\b\b\bxllo\b\b\bxllo\b\b\b\b"
 
 # I: Insert before first non-blank.
 # ^: Move to the first non-whitespace character.
-testseq "  ab\0033Ixy" " $   ab\b\bxab\b\byab\b\b"
-testseq "  ab\00332Ixy\0033" " $   ab\b\bxab\b\byab\b\bxyab\b\b\b"
-testseq "  ab\0033^ixy" " $   ab\b\bxab\b\byab\b\b"
+testseq "  ab\0033Ixy" " #   ab\b\bxab\b\byab\b\b"
+testseq "  ab\00332Ixy\0033" " #   ab\b\bxab\b\byab\b\bxyab\b\b\b"
+testseq "  ab\0033^ixy" " #   ab\b\bxab\b\byab\b\b"
 
 # L: Undefined command (beep).
-testseq "ab\0033Lx" " $ ab\b\a \b\b"
+testseq "ab\0033Lx" " # ab\b\a \b\b"
 
 # l, space: Move right.
 # ~: Change case.
-testseq "abc\003302l~" " $ abc\b\b\babC\b"
-testseq "abc\00330 rx" " $ abc\b\b\bax\b"
+testseq "abc\003302l~" " # abc\b\b\babC\b"
+testseq "abc\00330 rx" " # abc\b\b\bax\b"
 
 # P: Paste at current position.
-testseq "abcde\0033hDhP" " $ abcde\b\b  \b\b\b\bdebc\b\b"
-testseq "abcde\0033hDh2P" " $ abcde\b\b  \b\b\b\bdedebc\b\b\b"
+testseq "abcde\0033hDhP" " # abcde\b\b  \b\b\b\bdebc\b\b"
+testseq "abcde\0033hDh2P" " # abcde\b\b  \b\b\b\bdedebc\b\b\b"
 
 # p: Paste after current position.
-testseq "abcd\0033hDhp" " $ abcd\b\b  \b\b\b\bacdb\b\b"
-testseq "abcd\0033hDh2p" " $ abcd\b\b  \b\b\b\bacdcdb\b\b"
+testseq "abcd\0033hDhp" " # abcd\b\b  \b\b\b\bacdb\b\b"
+testseq "abcd\0033hDh2p" " # abcd\b\b  \b\b\b\bacdcdb\b\b"
 
 # R: Replace.
-testseq "abcd\00332h2Rx\0033" " $ abcd\b\b\bxx\b"
-testseq "abcdef\00334h2Rxy\0033" " $ abcdef\b\b\b\b\bxyxy\b"
+testseq "abcd\00332h2Rx\0033" " # abcd\b\b\bxx\b"
+testseq "abcdef\00334h2Rxy\0033" " # abcdef\b\b\b\b\bxyxy\b"
 
 # r: Replace character.
-testseq "abcd\00332h2rxiy" " $ abcd\b\b\bxx\byxd\b\b"
-testseq "\0303\0266\0033ro" " $ \0303\0266\bo \b\b"
-testseq "\0342\0202\0254\0033ro" " $ \0342\0202\0254\bo  \b\b\b"
-testseq "\0303\0266\00332ro" " $ \0303\0266\b\a"
+testseq "abcd\00332h2rxiy" " # abcd\b\b\bxx\byxd\b\b"
+testseq "\0303\0266\0033ro" " # \0303\0266\bo \b\b"
+testseq "\0342\0202\0254\0033ro" " # \0342\0202\0254\bo  \b\b\b"
+testseq "\0303\0266\00332ro" " # \0303\0266\b\a"
 
 # S: Substitute whole line.
-testseq "oldst\0033Snew" " $ oldst\b\b\b\b\b     \r $ new"
-testseq "oldstr\033Snew" " $ oldstr\b\r $       \r $ new"
+testseq "oldst\0033Snew" " # oldst\b\b\b\b\b     \r # new"
+testseq "oldstr\033Snew" " # oldstr\b\r #       \r # new"
 
 # s: Substitute.
-testseq "abcd\00332h2sx" " $ abcd\b\b\bd  \b\b\bxd\b"
-testseq "\0303\0266\0033s" " $ \0303\0266\b  \b\b"
+testseq "abcd\00332h2sx" " # abcd\b\b\bd  \b\b\bxd\b"
+testseq "\0303\0266\0033s" " # \0303\0266\b  \b\b"
 
 # T: Move backward after character.
-testseq "helloo\0033TlD" " $ helloo\b\b  \b\b\b"
-testseq "hello\00332TlD" " $ hello\b\b  \b\b\b"
+testseq "helloo\0033TlD" " # helloo\b\b  \b\b\b"
+testseq "hello\00332TlD" " # hello\b\b  \b\b\b"
 
 # t: Move forward before character.
-testseq "abc\00330tcD" " $ abc\b\b\ba  \b\b\b"
-testseq "hello\003302tlD" " $ hello\b\b\b\b\bhe   \b\b\b\b"
+testseq "abc\00330tcD" " # abc\b\b\ba  \b\b\b"
+testseq "hello\003302tlD" " # hello\b\b\b\b\bhe   \b\b\b\b"
 
 # U: Undo all changes.
-testseq "test\0033U" " $ test\b\b\b\b    \b\b\b\b"
+testseq "test\0033U" " # test\b\b\b\b    \b\b\b\b"
 
 # u: Undo.
-testseq "test\0033hxu" " $ test\b\bt \b\bst\b\b"
+testseq "test\0033hxu" " # test\b\bt \b\bst\b\b"
 
 # W: Move forward big word.
-testseq "1.0 two\00330WD" " $ 1.0 two\b\r $ 1.0    \b\b\b\b"
+testseq "1.0 two\00330WD" " # 1.0 two\b\r # 1.0    \b\b\b\b"
 
 # w: Move forward word.
-testseq "ab cd ef\003302wD" " $ ab cd ef\b\r $ ab cd   \b\b\b"
+testseq "ab cd ef\003302wD" " # ab cd ef\b\r # ab cd   \b\b\b"
 
 # X: Delete previous character.
-testseq "abcd\00332X" " $ abcd\b\b\bd  \b\b\b"
+testseq "abcd\00332X" " # abcd\b\b\bd  \b\b\b"
 
 # x: Delete character.
 # |: Move to column.
-testseq "abcd\00332|2x" " $ abcd\b\b\bd  \b\b\b"
-testseq "\0303\0266a\0033xx" " $ \0303\0266a\b \b\b  \b\b"
+testseq "abcd\00332|2x" " # abcd\b\b\bd  \b\b\b"
+testseq "\0303\0266a\0033xx" " # \0303\0266a\b \b\b  \b\b"
 
 # Y: Yank to end of line.
-testseq "abcd\0033hYp" " $ abcd\b\bccdd\b\b"
+testseq "abcd\0033hYp" " # abcd\b\bccdd\b\b"
 
 # y: Yank region.
 # $: Move to the last character.
-testseq "abcd\00332h2ylp" " $ abcd\b\b\bbbccd\b\b\b"
-testseq "abcd\00332h2yl\$p" " $ abcd\b\b\bbcdbc\b"
+testseq "abcd\00332h2ylp" " # abcd\b\b\bbbccd\b\b\b"
+testseq "abcd\00332h2yl\$p" " # abcd\b\b\bbcdbc\b"
 
 # %: Find match.
-testseq "(x)\0033%lrc" " $ (x)\b\b\b(c\b"
-testseq "(x)\00330%hrc" " $ (x)\b\b\b(x\bc\b"
+testseq "(x)\0033%lrc" " # (x)\b\b\b(c\b"
+testseq "(x)\00330%hrc" " # (x)\b\b\b(x\bc\b"
 
 # ^L, ^R: Redraw.
-testseq "test\0033\0014" " $ test\b\r\r\n $ test\b"
-testseq "test\0033h\0022" " $ test\b\b\r\r\n $ test\b\b"
+testseq "test\0033\0014" " # test\b\r\r\n # test\b"
+testseq "test\0033h\0022" " # test\b\b\r\r\n # test\b\b"