[test/spec] Reorganize test cases

oilshell · Jan 21, 2022 · 44ddf18 · 44ddf18
1 parent 9c55be9
commit 44ddf18
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 35 deletions.
diff --git a/spec/sh-usage.test.sh b/spec/sh-usage.test.sh
@@ -88,33 +88,3 @@ $SH --login -c 'exit 0'
 ## status: 0
 ## OK dash status: 2
 ## OK mksh status: 1
-
-#### $PATH is set if unset at startup
-
-# Get absolute path before changing PATH
-sh=$(which $SH)
-
-old_path=$PATH
-unset PATH
-
-$sh -c 'echo $PATH' > path.txt
-
-PATH=$old_path
-
-# looks like PATH=/usr/bin:/bin for mksh, but more complicated for others
-# cat path.txt
-
-# should contain /usr/bin
-if egrep -q '(^|:)/usr/bin($|:)' path.txt; then
-  echo yes
-fi
-
-# should contain /bin
-if egrep -q '(^|:)/bin($|:)' path.txt ; then
-  echo yes
-fi
-
-## STDOUT:
-yes
-yes
-## END
diff --git a/spec/special-vars.test.sh → spec/vars-special.test.sh b/spec/special-vars.test.sh → spec/vars-special.test.sh
@@ -21,6 +21,37 @@ env | grep PWD
 ## status: 0
 ## BUG mksh status: 1
 
+#### $PATH is set if unset at startup
+
+# Get absolute path before changing PATH
+sh=$(which $SH)
+
+old_path=$PATH
+unset PATH
+
+$sh -c 'echo $PATH' > path.txt
+
+PATH=$old_path
+
+# looks like PATH=/usr/bin:/bin for mksh, but more complicated for others
+# cat path.txt
+
+# should contain /usr/bin
+if egrep -q '(^|:)/usr/bin($|:)' path.txt; then
+  echo yes
+fi
+
+# should contain /bin
+if egrep -q '(^|:)/bin($|:)' path.txt ; then
+  echo yes
+fi
+
+## STDOUT:
+yes
+yes
+## END
+
+
 #### $HOME is NOT set
 case $SH in *zsh) echo 'zsh sets HOME'; exit ;; esac
 

diff --git a/test/spec.sh b/test/spec.sh
@@ -459,6 +459,11 @@ vars-bash() {
     $BASH $OSH_LIST "$@"
 }
 
+vars-special() {
+  sh-spec spec/vars-special.test.sh --osh-failures-allowed 6 \
+    ${REF_SHELLS[@]} $ZSH $OSH_LIST "$@"
+}
+
 # This is bash/OSH only
 builtin-completion() {
   sh-spec spec/builtin-completion.test.sh --osh-failures-allowed 1 \
@@ -544,11 +549,6 @@ posix() {
     ${REF_SHELLS[@]} $OSH_LIST "$@"
 }
 
-special-vars() {
-  sh-spec spec/special-vars.test.sh --osh-failures-allowed 6 \
-    ${REF_SHELLS[@]} $ZSH $OSH_LIST "$@"
-}
-
 introspect() {
   sh-spec spec/introspect.test.sh --osh-failures-allowed 0 \
     $BASH $OSH_LIST "$@"