[spec/xtrace] OSH passes 2 more tests

core/dev.py

@@ -196,6 +196,8 @@ def __init__(self,
     self.word_ev = word_ev
     self.f = f  # can be stderr, the --debug-file, etc.
 
+    self.X_indent = ''
+
     # PS4 value -> compound_word.  PS4 is scoped.
     self.parse_cache = {}  # type: Dict[str, compound_word]
 
@@ -208,6 +210,9 @@ def _EvalPS4(self):
 
     BASH_XTRACEFD exists.
     """
+    # Change this to be the default?  Users can change it to '+ ' I guess?
+    ps4 = '${X_indent}${X_punct}${X_tag} '
+
     ps4 = '+ '  # default
     val = self.mem.GetValue('PS4')
     if val.tag_() == value_e.Str:

spec/xtrace.test.sh

@@ -147,6 +147,14 @@ echo two
 + local 'PS4=- '
 - echo func
 + echo two
+## END
+## OK osh STDERR:
++ echo one
++ f
++ local PS4='- ' 
+- echo func
++ echo two
+## END
 ## OK dash STDERR:
 # dash loses information about spaces!  There is a trailing space, but you
 # can't see it.
@@ -155,19 +163,14 @@ echo two
 + local PS4=- 
 - echo func
 + echo two
+## END
 ## OK mksh STDERR:
 # local gets turned into typeset
 + echo one
 + f
 + typeset 'PS4=- '
 - echo func
 + echo two
-## BUG osh STDERR:
-# local gets turned into typeset
-+ echo one
-+ f
-- echo func
-+ echo two
 ## END
 
 #### xtrace with variables in PS4
@@ -180,27 +183,29 @@ echo two
 ## STDOUT:
 one
 two
+## END
+
 ## STDERR:
 +:x=1
 +1:echo one
 +1:x=2
 +2:echo two
+## END
+
 ## OK mksh STDERR:
 # mksh has trailing spaces
 +:x=1 
 +1:echo one
 +1:x=2 
 +2:echo two
-## OK dash STDERR:
-# dash evaluates it earlier
+## END
+
+## OK osh/dash STDERR:
+# the PS4 string is evaluated AFTER the variable is set.  That's OK
 +1:x=1
 +1:echo one
 +2:x=2
 +2:echo two
-## OK osh STDERR:
-# dash evaluates it earlier
-+1:echo one
-+2:echo two
 ## END
 
 #### PS4 with unterminated ${

test/spec.sh

@@ -617,7 +617,7 @@ sh-options() {
 }
 
 xtrace() {
-  sh-spec spec/xtrace.test.sh --osh-failures-allowed 3 \
+  sh-spec spec/xtrace.test.sh --osh-failures-allowed 1 \
     ${REF_SHELLS[@]} $OSH_LIST "$@"
 }