Whamcloud - gitweb
tests: clean up sed filtering of test output
authorAndreas Dilger <adilger@dilger.ca>
Sat, 15 Jun 2013 22:44:09 +0000 (18:44 -0400)
committerTheodore Ts'o <tytso@mit.edu>
Sat, 15 Jun 2013 22:44:09 +0000 (18:44 -0400)
commitf9fd342e568dbadaadbb0b242f14271cb384c38b
tree5496324d1de0858250481a5ce81946e2052487a1
parent4718395120454ad7c193c76258ef5359f2ab3f2f
tests: clean up sed filtering of test output

The sed filters for test outputs that are used to remove build and
test specific information (such as version strings, dates, times,
UUIDs) were unconditionally deleting the first line of output.  This
would normally contain the tool version string, but in some cases
contained other information that was being lost.  This can lead to
difficulty debugging test failures.

The sed filtering has been changed to only remove the actual version
strings.  As well, similar filter strings were duplicated throughout
many scripts, and "sed" and "tr" were often called multiple times in
a pipeline.  These have been consolidated into a single filter.sed
file to avoid having to maintain these filters in multiple places.

In a few cases, accidentally deleted messages have been restored to
the expect output for the tests.  In other cases, trivial whitespace
has been changed in the expect files.

Signed-off-by: Andreas Dilger <adilger@dilger.ca>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
30 files changed:
tests/d_loaddump/script
tests/d_special_files/script
tests/f_jnl_32bit/expect.0
tests/f_jnl_32bit/script
tests/f_jnl_64bit/expect.0
tests/f_jnl_64bit/script
tests/f_jnl_errno/expect.0
tests/f_jnl_errno/script
tests/f_orphan_indirect_inode/expect.1
tests/f_preen/expect.1
tests/f_resize_inode/script
tests/filter.sed [moved from tests/filter_dumpe2fs with 63% similarity]
tests/m_bigjournal/expect.1
tests/m_dasd_bs/expect.1
tests/m_extent_journal/expect.1
tests/m_large_file/expect.1
tests/m_meta_bg/expect.1
tests/m_mkfs_overhead/script
tests/m_mmp/expect.1
tests/m_no_opt/expect.1
tests/m_raid_opt/expect.1
tests/m_std/expect.1
tests/m_uninit/expect.1
tests/r_inline_xattr/script
tests/r_move_itable/expect
tests/r_move_itable/script
tests/r_resize_inode/expect
tests/r_resize_inode/script
tests/run_e2fsck
tests/run_mke2fs