[test/spec refactor] Move more metadata to spec/*

Fix index-tea.md
oilshell · Aug 13, 2023 · 751619a · 751619a
1 parent 49a2ea0
commit 751619a
Show file tree

Hide file tree

Showing 12 changed files with 38 additions and 28 deletions.
diff --git a/doc/ref/index-tea.md b/doc/ref/index-tea.md
@@ -31,7 +31,7 @@ language and eggex (for lexers).
   Functions and Data (<a class="group-link" href="tea-help.html#func-data">func-data</a>)
 </h2>
 
-```oil-help-topics
+```chapter-links-tea
                   func      func inc(p, p2=0; n=0, ...named) { echo 'hi' }
                   data      data Point(x Int, y Int)
                   enum      enum Tree { Leaf(x Int), Node(left Tree, right Tree) }
@@ -48,7 +48,7 @@ language and eggex (for lexers).
   Builtin Data Types (<a class="group-link" href="tea-help.html#types">types</a>)
 </h2>
 
-```oil-help-topics
+```chapter-links-tea
   [Literals]      Str           r'\'   c'\n'   "$var"   X multiline r""" c'''
                   X Symbol      %foo
                   Bool          True   False   None
@@ -73,7 +73,7 @@ language and eggex (for lexers).
   Mods / Objects (<a class="group-link" href="tea-help.html#mod">mod</a>)
 </h2>
 
-```oil-help-topics
+```chapter-links-tea
   [Objects]       class         bundle state and behavior (aka module)
                   extends       inheritance
                   self          pseudo-keyword

diff --git a/spec/assoc.test.sh b/spec/assoc.test.sh
@@ -1,3 +1,6 @@
+## compare_shells: bash
+## oils_failures_allowed: 3
+
 
 # NOTE:
 # -declare -A is required.

diff --git a/spec/builtin-bash.test.sh b/spec/builtin-bash.test.sh
@@ -1,4 +1,6 @@
-# builtins specific to bash and OSH
+## oils_failures_allowed: 4
+## compare_shells: bash
+
 
 #### help
 help

diff --git a/spec/builtin-trap-bash.test.sh b/spec/builtin-trap-bash.test.sh
@@ -1,4 +1,5 @@
-# builtin-trap-bash.test.sh
+## oils_failures_allowed: 1
+## compare_shells: bash
 
 # Notes on bash semantics:
 

diff --git a/spec/introspect.test.sh b/spec/introspect.test.sh
@@ -1,4 +1,5 @@
-#
+## compare_shells: bash
+
 # Test call stack introspection.  There are a bunch of special variables
 # defined here:
 #

diff --git a/spec/nix-idioms.test.sh b/spec/nix-idioms.test.sh
@@ -1,3 +1,6 @@
+## compare_shells: bash
+## oils_failures_allowed: 2
+
 #### var ref to array 'preHooks[@]'
 #
 # This idiom discussed on

diff --git a/spec/nocasematch-match.test.sh b/spec/nocasematch-match.test.sh
@@ -1,4 +1,6 @@
-#
+## compare_shells: bash
+## oils_failures_allowed: 3
+
 # Tests nocasematch matching
 
 #### [[ equality matching

diff --git a/spec/type-compat.test.sh b/spec/type-compat.test.sh
@@ -1,4 +1,5 @@
-#
+## compare_shells: bash
+
 # Tests for bash's type flags on cells.  Hopefully we don't have to implement
 # this, but it's good to know the behavior.
 #

diff --git a/spec/var-op-bash.test.sh b/spec/var-op-bash.test.sh
@@ -1,3 +1,5 @@
+## compare_shells: bash
+
 #### Lower Case with , and ,,
 x='ABC DEF'
 echo ${x,}

diff --git a/spec/var-ref.test.sh b/spec/var-ref.test.sh
@@ -1,4 +1,5 @@
-#
+## compare_shells: bash
+
 # Var refs are done with ${!a}
 #
 # local/declare -n is tested in spec/named-ref.test.sh.

diff --git a/spec/vars-bash.test.sh b/spec/vars-bash.test.sh
@@ -1,3 +1,6 @@
+## oils_failures_allowed: 1
+## compare_shells: bash
+
 #### $SHELL set to login shell
 
 sh=$(which $SH)

diff --git a/test/spec.sh b/test/spec.sh
@@ -244,20 +244,17 @@ builtin-trap() {
 }
 
 builtin-trap-bash() {
-  sh-spec spec/builtin-trap-bash.test.sh --oils-failures-allowed 1 \
-    $BASH $OSH_LIST "$@"
+  run-file builtin-trap-bash "$@"
 }
 
 # Bash implements type -t, but no other shell does.  For Nix.
 # zsh/mksh/dash don't have the 'help' builtin.
 builtin-bash() {
-  sh-spec spec/builtin-bash.test.sh --oils-failures-allowed 4 \
-    $BASH $OSH_LIST "$@"
+  run-file builtin-bash "$@"
 }
 
 vars-bash() {
-  sh-spec spec/vars-bash.test.sh --oils-failures-allowed 1 \
-    $BASH $OSH_LIST "$@"
+  run-file vars-bash "$@"
 }
 
 vars-special() {
@@ -349,8 +346,7 @@ posix() {
 }
 
 introspect() {
-  sh-spec spec/introspect.test.sh --oils-failures-allowed 0 \
-    $BASH $OSH_LIST "$@"
+  run-file introspect "$@"
 }
 
 tilde() {
@@ -382,8 +378,7 @@ var-op-slice() {
 }
 
 var-op-bash() {
-  sh-spec spec/var-op-bash.test.sh --oils-failures-allowed 5 \
-    $BASH $OSH_LIST "$@"
+  run-file var-op-bash "$@"
 }
 
 var-op-strip() {
@@ -464,7 +459,7 @@ array-compat() {
 }
 
 type-compat() {
-  sh-spec spec/type-compat.test.sh $BASH $OSH_LIST "$@"
+  run-file type-compat "$@"
 }
 
 # += is not POSIX and not in dash.
@@ -474,8 +469,7 @@ append() {
 
 # associative array -- mksh and zsh implement different associative arrays.
 assoc() {
-  sh-spec spec/assoc.test.sh --oils-failures-allowed 3 \
-    $BASH $OSH_LIST "$@"
+  run-file assoc "$@"
 }
 
 # ZSH also has associative arrays
@@ -525,15 +519,13 @@ extglob-match() {
 }
 
 nocasematch-match() {
-  sh-spec spec/nocasematch-match.test.sh --oils-failures-allowed 3 \
-    $BASH $OSH_LIST "$@"
+  run-file nocasematch-match "$@"
 }
 
 # ${!var} syntax -- oil should replace this with associative arrays.
 # mksh has completely different behavior for this syntax.  Not worth testing.
 var-ref() {
-  sh-spec spec/var-ref.test.sh --oils-failures-allowed 0 \
-    $BASH $OSH_LIST "$@"
+  run-file var-ref "$@"
 }
 
 # declare / local -n
@@ -887,8 +879,7 @@ ysh-dev() {
 #
 
 nix-idioms() {
-  sh-spec spec/nix-idioms.test.sh --oils-failures-allowed 2 \
-    $BASH $OSH_LIST "$@"
+  run-file nix-idioms "$@"
 }
 
 ble-idioms() {