Don't remove trailing spaces from plain lines in spec tests.

xtrace.test.sh now uses the new assertion format.

spec/xtrace.test.sh

@@ -23,6 +23,14 @@ echo two >&2
one
+ echo two
two
## OK mksh STDERR:
# mksh traces redirects!
+ >&2 
+ echo one
one
+ >&2 
+ echo two
two
## END

### PS4 is scoped
@@ -40,4 +48,19 @@ echo two
+ local 'PS4=- '
- echo func
+ echo two
## OK dash STDERR:
# dash loses information about spaces!  There is a trailing space, but you
# can't see it.
+ echo one
+ f
+ local PS4=- 
- echo func
+ echo two
## OK mksh STDERR:
# local gets turned into typeset
+ echo one
+ f
+ typeset 'PS4=- '
- echo func
+ echo two
## END

test/sh_spec.py

@@ -141,7 +141,7 @@ def LineIter(f):
    # Non-empty line that doesn't start with '#'
    # NOTE: We need the original line to test the whitespace sensitive <<-.
    # And we need rstrip because we add newlines back below.
    yield line_num, PLAIN_LINE, line.rstrip()
    yield line_num, PLAIN_LINE, line.rstrip('\n')

  yield line_num, EOF, None