29367: update tests redirection of stderr.

1 files changed, 19 insertions, 7 deletions

diff --git a/Test/E02xtrace.ztst b/Test/E02xtrace.ztst
index a0c2e9660..2420aebd7 100644
--- a/Test/E02xtrace.ztst
+++ b/Test/E02xtrace.ztst
@@ -7,6 +7,11 @@
     local regression_test_dummy_variable
     print "$*"
   }
+  function xtfx {
+    local regression_test_dummy_variable
+    print "Tracing: (){ builtin 2>file }" 2>>xtrace.err
+    { print "Tracing: (){ { builtin } 2>file }" } 2>>xtrace.err
+  }
   echo 'print "$*"' > xt.in
 
 %test
@@ -31,6 +36,7 @@
   repeat 1 do cat <<<'Tracing: do external done 2>file'; done 2>>xtrace.err
   xtf 'Tracing: function'
   xtf 'Tracing: function 2>file' 2>>xtrace.err
+  xtfx
   . ./xt.in 'Tracing: source'
   . ./xt.in 'Tracing: source 2>file' 2>>xtrace.err
   set +x
@@ -54,23 +60,23 @@
 >Tracing: do external done 2>file
 >Tracing: function
 >Tracing: function 2>file
+>Tracing: (){ builtin 2>file }
+>Tracing: (){ { builtin } 2>file }
 >Tracing: source
 >Tracing: source 2>file
->+(eval):4> print 'Tracing: builtin 2>file'
->+(eval):6> cat
 >+(eval):8> print 'Tracing: ( builtin ) 2>file'
 >+(eval):10> cat
 >+(eval):12> print 'Tracing: { builtin } 2>file'
 >+(eval):14> cat
 >+(eval):16> print 'Tracing: do builtin done 2>file'
 >+(eval):18> cat
->+(eval):20> xtf 'Tracing: function 2>file'
 >+xtf:1> local regression_test_dummy_variable
 >+xtf:2> print 'Tracing: function 2>file'
->+(eval):22> . ./xt.in 'Tracing: source 2>file'
->+./xt.in:1> print 'Tracing: source 2>file'
+>+xtfx:3> print 'Tracing: (){ { builtin } 2>file }'
 ?+(eval):3> print 'Tracing: builtin'
+?+(eval):4> print 'Tracing: builtin 2>file'
 ?+(eval):5> cat
+?+(eval):6> cat
 ?+(eval):7> print 'Tracing: ( builtin )'
 ?+(eval):9> cat
 ?+(eval):11> print 'Tracing: { builtin }'
@@ -80,9 +86,15 @@
 ?+(eval):19> xtf 'Tracing: function'
 ?+xtf:1> local regression_test_dummy_variable
 ?+xtf:2> print 'Tracing: function'
-?+(eval):21> . ./xt.in 'Tracing: source'
+?+(eval):20> xtf 'Tracing: function 2>file'
+?+(eval):21> xtfx
+?+xtfx:1> local regression_test_dummy_variable
+?+xtfx:2> print 'Tracing: (){ builtin 2>file }'
+?+(eval):22> . ./xt.in 'Tracing: source'
 ?+./xt.in:1> print 'Tracing: source'
-?+(eval):23> set +x
+?+(eval):23> . ./xt.in 'Tracing: source 2>file'
+?+./xt.in:1> print 'Tracing: source 2>file'
+?+(eval):24> set +x
 
  typeset -ft xtf
  xtf 'Tracing: function'