diff options
| author | Richard W.M. Jones <rjones@redhat.com> | 2011-10-12 21:54:24 +0100 |
|---|---|---|
| committer | Jim Meyering <meyering@redhat.com> | 2011-10-14 19:12:46 +0200 |
| commit | c774ea6bf4f3112c2a5c5d8458310697d21ddcf8 (patch) | |
| tree | 2f214900c61d78050d1e455c28ff783305a87971 /tests/t0000-basic.sh | |
| parent | f09c0b86bbdf3a3bf51c1b826b3e1c46514feb58 (diff) | |
| download | parted-c774ea6bf4f3112c2a5c5d8458310697d21ddcf8.tar.gz | |
tests: fix the tests for the case where stdout/stderr is different
tests/t0000-basic.sh:
- More than one bogus ^M[[:space:]]*^M had to be removed, hence
use s,,,g sed expression.
tests/t0203-gpt-tiny-device-abort.sh:
- Test was not expecting any output to stderr. No longer true.
tests/t1100-busy-label.sh:
- Another case of s,,,g as above.
tests/t7000-scripting.sh:
- Only testing output to stdout. Fold stdout & stderr together
and test both.
- Another case of s,,,g as above.
Some root tests still fail even with these fixes. The failures appear
to be unrelated to these changes.
Diffstat (limited to 'tests/t0000-basic.sh')
| -rwxr-xr-x | tests/t0000-basic.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/t0000-basic.sh b/tests/t0000-basic.sh index 4d6deeb..d07177e 100755 --- a/tests/t0000-basic.sh +++ b/tests/t0000-basic.sh @@ -61,7 +61,7 @@ parted ---pretend-input-tty $dev mklabel msdos < in > out 2>&1 || fail=1 # Transform the actual output, to avoid spurious differences when # $PWD contains a symlink-to-dir. Also, remove the ^M ...^M bogosity. # normalize the actual output -mv out o2 && sed -e "s,on /.*/$dev,on DEVICE,;s,
*
,,;s, $,," \ +mv out o2 && sed -e "s,on /.*/$dev,on DEVICE,;s,
*
,,g;s, $,," \ -e "s,^.*/lt-parted: ,parted: ," o2 > out # Create expected output file. |