diff --git a/tests/test_shells/bash.daemon.ok b/tests/test_shells/bash.daemon.ok index e9132e60..f6c3d0ff 100644 --- a/tests/test_shells/bash.daemon.ok +++ b/tests/test_shells/bash.daemon.ok @@ -25,5 +25,6 @@ def   BRANCH  ⋯  shell  3rd  #[bold]  cd ../'(echo)'   BRANCH  ⋯  shell  3rd  (echo)  cd ../'$(echo)'   BRANCH  ⋯  shell  3rd  $(echo)  cd ../'`echo`' -  BRANCH  ⋯  shell  3rd  `echo`  POWERLINE_COMMAND="$POWERLINE_COMMAND -t default_leftonly.dividers.left.hard=\$ABC" -  BRANCH $ABC⋯  shell  3rd  `echo` $ABCfalse +  BRANCH  ⋯  shell  3rd  `echo`  cd ../'«Unicode!»' +  BRANCH  ⋯  shell  3rd  «Unicode!»  POWERLINE_COMMAND="$POWERLINE_COMMAND -t default_leftonly.dividers.left.hard=\$ABC" +  BRANCH $ABC⋯  shell  3rd  «Unicode!» $ABCfalse diff --git a/tests/test_shells/bash.nodaemon.ok b/tests/test_shells/bash.nodaemon.ok index 09b21b5c..36e317fe 100644 --- a/tests/test_shells/bash.nodaemon.ok +++ b/tests/test_shells/bash.nodaemon.ok @@ -25,5 +25,6 @@ def   BRANCH  ⋯  shell  3rd  #[bold]  cd ../'(echo)'   BRANCH  ⋯  shell  3rd  (echo)  cd ../'$(echo)'   BRANCH  ⋯  shell  3rd  $(echo)  cd ../'`echo`' -  BRANCH  ⋯  shell  3rd  `echo`  POWERLINE_COMMAND="$POWERLINE_COMMAND -t default_leftonly.dividers.left.hard=\$ABC" -  BRANCH $ABC⋯  shell  3rd  `echo` $ABCfalse +  BRANCH  ⋯  shell  3rd  `echo`  cd ../'«Unicode!»' +  BRANCH  ⋯  shell  3rd  «Unicode!»  POWERLINE_COMMAND="$POWERLINE_COMMAND -t default_leftonly.dividers.left.hard=\$ABC" +  BRANCH $ABC⋯  shell  3rd  «Unicode!» $ABCfalse diff --git a/tests/test_shells/busybox.daemon.ok b/tests/test_shells/busybox.daemon.ok index 60939a71..fcaf7474 100644 --- a/tests/test_shells/busybox.daemon.ok +++ b/tests/test_shells/busybox.daemon.ok @@ -24,5 +24,6 @@ def   BRANCH  ⋯  shell  3rd  #[bold]  cd ../'(echo)'   BRANCH  ⋯  shell  3rd  (echo)  cd ../'$(echo)'   BRANCH  ⋯  shell  3rd  $(echo)  cd ../'`echo`' -  BRANCH  ⋯  shell  3rd  `echo`  POWERLINE_COMMAND="$POWERLINE_COMMAND -t default_leftonly.dividers.left.hard=\$ABC" -  BRANCH $ABC⋯  shell  3rd  `echo` $ABCfalse +  BRANCH  ⋯  shell  3rd  `echo`  cd ../'«Unicode!»' +  BRANCH  ⋯  shell  3rd  «Unicode!»  POWERLINE_COMMAND="$POWERLINE_COMMAND -t default_leftonly.dividers.left.hard=\$ABC" +  BRANCH $ABC⋯  shell  3rd  «Unicode!» $ABCfalse diff --git a/tests/test_shells/busybox.nodaemon.ok b/tests/test_shells/busybox.nodaemon.ok index b3a90542..f3edb6e8 100644 --- a/tests/test_shells/busybox.nodaemon.ok +++ b/tests/test_shells/busybox.nodaemon.ok @@ -24,5 +24,6 @@ def   BRANCH  ⋯  shell  3rd  #[bold]  cd ../'(echo)'   BRANCH  ⋯  shell  3rd  (echo)  cd ../'$(echo)'   BRANCH  ⋯  shell  3rd  $(echo)  cd ../'`echo`' -  BRANCH  ⋯  shell  3rd  `echo`  POWERLINE_COMMAND="$POWERLINE_COMMAND -t default_leftonly.dividers.left.hard=\$ABC" -  BRANCH $ABC⋯  shell  3rd  `echo` $ABCfalse +  BRANCH  ⋯  shell  3rd  `echo`  cd ../'«Unicode!»' +  BRANCH  ⋯  shell  3rd  «Unicode!»  POWERLINE_COMMAND="$POWERLINE_COMMAND -t default_leftonly.dividers.left.hard=\$ABC" +  BRANCH $ABC⋯  shell  3rd  «Unicode!» $ABCfalse diff --git a/tests/test_shells/dash.daemon.ok b/tests/test_shells/dash.daemon.ok index 93b364ed..cbcd8f79 100644 --- a/tests/test_shells/dash.daemon.ok +++ b/tests/test_shells/dash.daemon.ok @@ -23,5 +23,6 @@ def   BRANCH  ⋯  shell  3rd  #[bold]  cd ../'(echo)'   BRANCH  ⋯  shell  3rd  (echo)  cd ../'$(echo)'   BRANCH  ⋯  shell  3rd  $(echo)  cd ../'`echo`' -  BRANCH  ⋯  shell  3rd  `echo`  POWERLINE_COMMAND="$POWERLINE_COMMAND -t default_leftonly.dividers.left.hard=\$ABC" -  BRANCH $ABC⋯  shell  3rd  `echo` $ABCfalse +  BRANCH  ⋯  shell  3rd  `echo`  cd ../'«Unicode!»' +  BRANCH  ⋯  shell  3rd  «Unicode!»  POWERLINE_COMMAND="$POWERLINE_COMMAND -t default_leftonly.dividers.left.hard=\$ABC" +  BRANCH $ABC⋯  shell  3rd  «Unicode!» $ABCfalse diff --git a/tests/test_shells/dash.nodaemon.ok b/tests/test_shells/dash.nodaemon.ok index 79770982..64e455b6 100644 --- a/tests/test_shells/dash.nodaemon.ok +++ b/tests/test_shells/dash.nodaemon.ok @@ -23,5 +23,6 @@ def   BRANCH  ⋯  shell  3rd  #[bold]  cd ../'(echo)'   BRANCH  ⋯  shell  3rd  (echo)  cd ../'$(echo)'   BRANCH  ⋯  shell  3rd  $(echo)  cd ../'`echo`' -  BRANCH  ⋯  shell  3rd  `echo`  POWERLINE_COMMAND="$POWERLINE_COMMAND -t default_leftonly.dividers.left.hard=\$ABC" -  BRANCH $ABC⋯  shell  3rd  `echo` $ABCfalse +  BRANCH  ⋯  shell  3rd  `echo`  cd ../'«Unicode!»' +  BRANCH  ⋯  shell  3rd  «Unicode!»  POWERLINE_COMMAND="$POWERLINE_COMMAND -t default_leftonly.dividers.left.hard=\$ABC" +  BRANCH $ABC⋯  shell  3rd  «Unicode!» $ABCfalse diff --git a/tests/test_shells/fish.ok b/tests/test_shells/fish.ok index 8364f6a9..c69abfc5 100644 --- a/tests/test_shells/fish.ok +++ b/tests/test_shells/fish.ok @@ -14,22 +14,23 @@   HOSTNAME  USER   BRANCH  ⋯  shell  3rd  (echo)     HOSTNAME  USER   BRANCH  ⋯  shell  3rd  $(echo)     HOSTNAME  USER   BRANCH  ⋯  shell  3rd  `echo`   - USER  ⋯  shell  3rd  `echo`   +  HOSTNAME  USER   BRANCH  ⋯  shell  3rd  «Unicode!»   + USER  ⋯  shell  3rd  «Unicode!»      BRANCH     BRANCH     BRANCH  - INSERT  USER  ⋯  shell  3rd  `echo`   + INSERT  USER  ⋯  shell  3rd  «Unicode!»      BRANCH  - DEFAULT  USER  ⋯  shell  3rd  `echo`   + DEFAULT  USER  ⋯  shell  3rd  «Unicode!»      BRANCH  - INSERT  USER  ⋯  shell  3rd  `echo`   + INSERT  USER  ⋯  shell  3rd  «Unicode!»      BRANCH  - DEFAULT  USER  ⋯  shell  3rd  `echo`   + DEFAULT  USER  ⋯  shell  3rd  «Unicode!»      BRANCH  - INSERT  USER  ⋯  shell  3rd  `echo`   + INSERT  USER  ⋯  shell  3rd  «Unicode!»      BRANCH     BRANCH  - INSERT  USER  ⋯  shell  3rd  `echo`   + INSERT  USER  ⋯  shell  3rd  «Unicode!»      BRANCH     BRANCH     BRANCH  diff --git a/tests/test_shells/input.bash b/tests/test_shells/input.bash index d224e6e7..4ad925fc 100644 --- a/tests/test_shells/input.bash +++ b/tests/test_shells/input.bash @@ -24,6 +24,7 @@ cd ../'#[bold]' cd ../'(echo)' cd ../'$(echo)' cd ../'`echo`' +cd ../'«Unicode!»' POWERLINE_COMMAND="$POWERLINE_COMMAND -t default_leftonly.dividers.left.hard=\$ABC" false true is the last line diff --git a/tests/test_shells/input.busybox b/tests/test_shells/input.busybox index 220d3b59..94bee2f5 100644 --- a/tests/test_shells/input.busybox +++ b/tests/test_shells/input.busybox @@ -24,6 +24,7 @@ cd ../'#[bold]' cd ../'(echo)' cd ../'$(echo)' cd ../'`echo`' +cd ../'«Unicode!»' POWERLINE_COMMAND="$POWERLINE_COMMAND -t default_leftonly.dividers.left.hard=\$ABC" false true is the last line diff --git a/tests/test_shells/input.dash b/tests/test_shells/input.dash index 220d3b59..94bee2f5 100644 --- a/tests/test_shells/input.dash +++ b/tests/test_shells/input.dash @@ -24,6 +24,7 @@ cd ../'#[bold]' cd ../'(echo)' cd ../'$(echo)' cd ../'`echo`' +cd ../'«Unicode!»' POWERLINE_COMMAND="$POWERLINE_COMMAND -t default_leftonly.dividers.left.hard=\$ABC" false true is the last line diff --git a/tests/test_shells/input.fish b/tests/test_shells/input.fish index d1d9d62e..0e09b54d 100644 --- a/tests/test_shells/input.fish +++ b/tests/test_shells/input.fish @@ -22,6 +22,7 @@ cd ../'#[bold]' cd ../'(echo)' cd ../'$(echo)' cd ../'`echo`' +cd ../'«Unicode!»' set POWERLINE_COMMAND "$POWERLINE_COMMAND -c ext.shell.theme=default" set -g fish_key_bindings fish_vi_key_bindings ii diff --git a/tests/test_shells/input.mksh b/tests/test_shells/input.mksh index 2da58cee..8174254a 100644 --- a/tests/test_shells/input.mksh +++ b/tests/test_shells/input.mksh @@ -25,6 +25,7 @@ cd ../'#[bold]' cd ../'(echo)' cd ../'$(echo)' cd ../'`echo`' +cd ../'«Unicode!»' POWERLINE_COMMAND="$POWERLINE_COMMAND -t default_leftonly.dividers.left.hard=\$ABC" false true is the last line diff --git a/tests/test_shells/input.tcsh b/tests/test_shells/input.tcsh index a9d2cf30..5302783b 100644 --- a/tests/test_shells/input.tcsh +++ b/tests/test_shells/input.tcsh @@ -17,6 +17,7 @@ cd ../'#[bold]' cd ../'(echo)' cd ../'$(echo)' cd ../'`echo`' +cd ../'«Unicode\!»' false true is the last line exit diff --git a/tests/test_shells/input.zsh b/tests/test_shells/input.zsh index 4aa6789d..937a9114 100644 --- a/tests/test_shells/input.zsh +++ b/tests/test_shells/input.zsh @@ -26,6 +26,7 @@ cd ../'#[bold]' cd ../'(echo)' cd ../'$(echo)' cd ../'`echo`' +cd ../'«Unicode!»' cd .. POWERLINE_COMMAND="${POWERLINE_COMMAND//_leftonly}" ; bindkey -v  diff --git a/tests/test_shells/mksh.daemon.ok b/tests/test_shells/mksh.daemon.ok index be403a46..72d58e3d 100644 --- a/tests/test_shells/mksh.daemon.ok +++ b/tests/test_shells/mksh.daemon.ok @@ -27,5 +27,6 @@ def   BRANCH  ⋯  shell  3rd  #[bold]  cd ../'(echo)'   BRANCH  ⋯  shell  3rd  (echo)  cd ../'$(echo)'   BRANCH  ⋯  shell  3rd  $(echo)  cd ../'`echo`' -  BRANCH  ⋯  shell  3rd  `echo`  POWERLINE_COMMAND="$POWERLINE_COMMAND -t default_leftonly.dividers.left.hard=\$ABC" -  BRANCH $ABC⋯  shell  3rd  `echo` $ABCfalse +  BRANCH  ⋯  shell  3rd  `echo`  cd ../'«Unicode!»' +  BRANCH  ⋯  shell  3rd  «Unicode!»  POWERLINE_COMMAND="$POWERLINE_COMMAND -t default_leftonly.dividers.left.hard=\$ABC" +  BRANCH $ABC⋯  shell  3rd  «Unicode!» $ABCfalse diff --git a/tests/test_shells/mksh.nodaemon.ok b/tests/test_shells/mksh.nodaemon.ok index d152cde7..a3550ca6 100644 --- a/tests/test_shells/mksh.nodaemon.ok +++ b/tests/test_shells/mksh.nodaemon.ok @@ -27,5 +27,6 @@ def   BRANCH  ⋯  shell  3rd  #[bold]  cd ../'(echo)'   BRANCH  ⋯  shell  3rd  (echo)  cd ../'$(echo)'   BRANCH  ⋯  shell  3rd  $(echo)  cd ../'`echo`' -  BRANCH  ⋯  shell  3rd  `echo`  POWERLINE_COMMAND="$POWERLINE_COMMAND -t default_leftonly.dividers.left.hard=\$ABC" -  BRANCH $ABC⋯  shell  3rd  `echo` $ABCfalse +  BRANCH  ⋯  shell  3rd  `echo`  cd ../'«Unicode!»' +  BRANCH  ⋯  shell  3rd  «Unicode!»  POWERLINE_COMMAND="$POWERLINE_COMMAND -t default_leftonly.dividers.left.hard=\$ABC" +  BRANCH $ABC⋯  shell  3rd  «Unicode!» $ABCfalse diff --git a/tests/test_shells/screenrc b/tests/test_shells/screenrc index 3ba7ba7f..ba25fd28 100644 --- a/tests/test_shells/screenrc +++ b/tests/test_shells/screenrc @@ -1,3 +1,7 @@ width 1024 height 1 logfile "tests/shell/${SH}.${TEST_TYPE}.${TEST_CLIENT}.full.log" +# Having utf8 setting on causes screen to recode file passed to readreg. Adding +# `-e utf8` just after `readreg` causes screen to fail with `-X: copyreg: +# character, ^x, or (octal) \032 expected.` in place of fixing the issue. +defutf8 off diff --git a/tests/test_shells/tcsh.ok b/tests/test_shells/tcsh.ok index cf87b8f9..03c2527c 100644 --- a/tests/test_shells/tcsh.ok +++ b/tests/test_shells/tcsh.ok @@ -14,3 +14,4 @@   HOSTNAME  USER   BRANCH  ⋯  shell  3rd  (echo)     HOSTNAME  USER   BRANCH  ⋯  shell  3rd  $(echo)     HOSTNAME  USER   BRANCH  ⋯  shell  3rd  `echo`   +  HOSTNAME  USER   BRANCH  ⋯  shell  3rd  «Unicode!»   diff --git a/tests/test_shells/test.sh b/tests/test_shells/test.sh index 4f1ba473..5550cdf8 100755 --- a/tests/test_shells/test.sh +++ b/tests/test_shells/test.sh @@ -173,6 +173,7 @@ mkdir tests/shell/3rd/'#[bold]' mkdir tests/shell/3rd/'(echo)' mkdir tests/shell/3rd/'$(echo)' mkdir tests/shell/3rd/'`echo`' +mkdir tests/shell/3rd/'«Unicode!»' mkdir tests/shell/fish_home mkdir tests/shell/fish_home/fish diff --git a/tests/test_shells/zsh.daemon.ok b/tests/test_shells/zsh.daemon.ok index 2a431ec0..01b4a0e1 100644 --- a/tests/test_shells/zsh.daemon.ok +++ b/tests/test_shells/zsh.daemon.ok @@ -16,7 +16,8 @@   HOSTNAME  USER   BRANCH  ⋯  shell  3rd  #[bold]  cd ../'(echo)'   HOSTNAME  USER   BRANCH  ⋯  shell  3rd  (echo)  cd ../'$(echo)'   HOSTNAME  USER   BRANCH  ⋯  shell  3rd  $(echo)  cd ../'`echo`' -  HOSTNAME  USER   BRANCH  ⋯  shell  3rd  `echo`  cd .. +  HOSTNAME  USER   BRANCH  ⋯  shell  3rd  `echo`  cd ../'«Unicode!»' +  HOSTNAME  USER   BRANCH  ⋯  shell  3rd  «Unicode!»  cd ..   HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  POWERLINE_COMMAND="${POWERLINE_COMMAND//_leftonly}" ; bindkey -v  INSERT   HOSTNAME  USER  ⋯  tests  shell  3rd   COMMND   HOSTNAME  USER  ⋯  tests  shell  3rd    INSERT   HOSTNAME  USER  ⋯  tests  shell  3rd   diff --git a/tests/test_shells/zsh.nodaemon.ok b/tests/test_shells/zsh.nodaemon.ok index 5a4c75d2..2b86af4e 100644 --- a/tests/test_shells/zsh.nodaemon.ok +++ b/tests/test_shells/zsh.nodaemon.ok @@ -16,7 +16,8 @@   HOSTNAME  USER   BRANCH  ⋯  shell  3rd  #[bold]  cd ../'(echo)'   HOSTNAME  USER   BRANCH  ⋯  shell  3rd  (echo)  cd ../'$(echo)'   HOSTNAME  USER   BRANCH  ⋯  shell  3rd  $(echo)  cd ../'`echo`' -  HOSTNAME  USER   BRANCH  ⋯  shell  3rd  `echo`  cd .. +  HOSTNAME  USER   BRANCH  ⋯  shell  3rd  `echo`  cd ../'«Unicode!»' +  HOSTNAME  USER   BRANCH  ⋯  shell  3rd  «Unicode!»  cd ..   HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  POWERLINE_COMMAND="${POWERLINE_COMMAND//_leftonly}" ; bindkey -v  INSERT   HOSTNAME  USER  ⋯  tests  shell  3rd   COMMND   HOSTNAME  USER  ⋯  tests  shell  3rd    INSERT   HOSTNAME  USER  ⋯  tests  shell  3rd 