/oil

Permalink
Browse files

Move 'dirs' tests to their own file, and only run on bash/zsh/osh. 

Remove dash/mksh annotations.
  • Loading branch information...
Andy Chu
Andy Chu committed Jan 8, 2018
1 parent fd31f81 commit 4a12881dfb6d56295001201136c33019217a0c40
Unified Split
Showing with 143 additions and 143 deletions.
  1. +137 −0 spec/builtin-dirs.test.sh
  2. +0 −140 spec/builtins2.test.sh
  3. +6 −3 test/spec.sh
View
137 spec/builtin-dirs.test.sh
@@ -0,0 +1,137 @@
#!/bin/bash
### dirs builtin
cd /
dirs
# status: 0
## STDOUT:
/
## END
### dirs -c to clear the stack
set -o errexit
cd /
pushd /tmp >/dev/null # zsh pushd doesn't print anything, but bash does
echo --
dirs
dirs -c
echo --
dirs
## status: 0
## STDOUT:
--
/tmp /
--
/tmp
## END
### dirs -v to print numbered stack, one entry per line
set -o errexit
cd /
pushd /tmp >/dev/null
echo --
dirs -v
pushd /lib >/dev/null
echo --
dirs -v
## status: 0
## STDOUT:
--
0 /tmp
1 /
--
0 /lib
1 /tmp
2 /
## END
#
# zsh uses tabs
## OK zsh stdout-json: "--\n0\t/tmp\n1\t/\n--\n0\t/lib\n1\t/tmp\n2\t/\n"
### dirs -p to print one entry per line
set -o errexit
cd /
pushd /tmp >/dev/null
echo --
dirs -p
pushd /lib >/dev/null
echo --
dirs -p
## STDOUT:
--
/tmp
/
--
/lib
/tmp
/
## END
### dirs -l to print in long format, no tilde prefix
# Can't use the OSH test harness for this because
# /home/<username> may be included in a path.
cd /
HOME=/tmp
mkdir -p $HOME/oil_test
pushd $HOME/oil_test >/dev/null
dirs
dirs -l
# status: 0
## STDOUT:
~/oil_test /
/tmp/oil_test /
## END
### dirs to print using tilde-prefix format
cd /
HOME=/tmp
mkdir -p $HOME/oil_test
pushd $HOME/oil_test >/dev/null
dirs
# stdout: ~/oil_test /
# status: 0
### dirs test converting true home directory to tilde
cd /
HOME=/tmp
mkdir -p $HOME/oil_test/$HOME
pushd $HOME/oil_test/$HOME >/dev/null
dirs
# stdout: ~/oil_test/tmp /
# status: 0
### dirs don't convert to tilde when $HOME is substring
cd /
mkdir -p /tmp/oil_test
mkdir -p /tmp/oil_tests
HOME=/tmp/oil_test
pushd /tmp/oil_tests
dirs
### dirs tilde test when $HOME is exactly $PWD
cd /
mkdir -p /tmp/oil_test
HOME=/tmp/oil_test
pushd $HOME
dirs
## status: 0
# zsh doesn't duplicate the stack I guess.
## OK zsh stdout-json: "~ /\n"
## STDOUT:
~ /
~ /
## END
### dirs test of path alias `..`
cd /tmp
pushd .. >/dev/null
dirs
# stdout: / /tmp
# status: 0
### dirs test of path alias `.`
cd /tmp
pushd . >/dev/null
dirs
# stdout: /tmp /tmp
# status: 0
View
140 spec/builtins2.test.sh
@@ -56,143 +56,3 @@ echo
myfunc
status=1
## END
### dirs builtin
cd /
dirs
# status: 0
## STDOUT:
/
## END
## N-I dash/mksh status: 127
## N-I dash/mksh stdout-json: ""
### dirs -c to clear the stack
set -o errexit
cd /
pushd /tmp >/dev/null # zsh pushd doesn't print anything, but bash does
echo --
dirs
dirs -c
echo --
dirs
## status: 0
## STDOUT:
--
/tmp /
--
/tmp
## N-I dash/mksh status: 127
## N-I dash/mksh stdout-json: ""
### dirs -v to print numbered stack, one entry per line
set -o errexit
cd /
pushd /tmp >/dev/null
echo --
dirs -v
pushd /lib >/dev/null
echo --
dirs -v
## status: 0
## STDOUT:
--
0 /tmp
1 /
--
0 /lib
1 /tmp
2 /
## END
#
# zsh uses tabs
## OK zsh stdout-json: "--\n0\t/tmp\n1\t/\n--\n0\t/lib\n1\t/tmp\n2\t/\n"
#
## N-I dash/mksh status: 127
## N-I dash/mksh stdout-json: ""
### dirs -p to print one entry per line
set -o errexit
cd /
pushd /tmp >/dev/null
echo --
dirs -p
pushd /lib >/dev/null
echo --
dirs -p
## STDOUT:
--
/tmp
/
--
/lib
/tmp
/
## N-I dash/mksh status: 127
## N-I dash/mksh stdout-json: ""
### dirs -l to print in long format, no tilde prefix
# Can't use the OSH test harness for this because
# /home/<username> may be included in a path.
cd /
HOME=/tmp
mkdir -p $HOME/oil_test
pushd $HOME/oil_test >/dev/null
dirs
dirs -l
# status: 0
## STDOUT:
~/oil_test /
/tmp/oil_test /
## END
### dirs to print using tilde-prefix format
cd /
HOME=/tmp
mkdir -p $HOME/oil_test
pushd $HOME/oil_test >/dev/null
dirs
# stdout: ~/oil_test /
# status: 0
### dirs test converting true home directory to tilde
cd /
HOME=/tmp
mkdir -p $HOME/oil_test/$HOME
pushd $HOME/oil_test/$HOME >/dev/null
dirs
# stdout: ~/oil_test/tmp /
# status: 0
### dirs don't convert to tilde when $HOME is substring
cd /
mkdir -p /tmp/oil_test
mkdir -p /tmp/oil_tests
HOME=/tmp/oil_test
pushd /tmp/oil_tests
dirs
### dirs tilde test when $HOME is exactly $PWD
cd /
mkdir -p /tmp/oil_test
HOME=/tmp/oil_test
pushd $HOME
dirs
# STDOUT:
~ /
~ /
# status: 0
### dirs test of path alias `..`
cd /tmp
pushd .. >/dev/null
dirs
# stdout: / /tmp
# status: 0
### dirs test of path alias `.`
cd /tmp
pushd . >/dev/null
dirs
# stdout: /tmp /tmp
# status: 0
View
9 test/spec.sh
@@ -266,9 +266,12 @@ builtin-io() {
}
builtins2() {
# 4 tests for 'dirs' fail.
sh-spec spec/builtins2.test.sh \
${REF_SHELLS[@]} $ZSH $OSH "$@"
sh-spec spec/builtins2.test.sh ${REF_SHELLS[@]} $ZSH $OSH "$@"
}
# dash and mksh don't implement 'dirs'
builtin-dirs() {
sh-spec spec/builtin-dirs.test.sh $BASH $ZSH $OSH "$@"
}
builtin-vars() {

0 comments on commit 4a12881

Please sign in to comment.