diff options
| author | Dave Chinner <dchinner@redhat.com> | 2018-05-07 08:45:31 +1000 |
|---|---|---|
| committer | Eryu Guan <guaneryu@gmail.com> | 2018-05-11 09:35:38 +0800 |
| commit | 46199319f61f02a48d2a2f4d0e85de8c167733c2 (patch) | |
| tree | e2f818711320c47473035d60cc1d5ab8cbf2d646 | |
| parent | 5509684db3b7efdba03619eb10f0d49dc28ba537 (diff) | |
| download | xfstests-dev-46199319f61f02a48d2a2f4d0e85de8c167733c2.tar.gz | |
fstests: remove old electric fence support
Just not used anymore.
Signed-Off-By: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Eryu Guan <guaneryu@gmail.com>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>
| -rwxr-xr-x | check | 7 | ||||
| -rw-r--r-- | common/log | 1 | ||||
| -rw-r--r-- | common/rc | 23 | ||||
| -rw-r--r-- | common/xfs | 9 | ||||
| -rwxr-xr-x | soak | 6 | ||||
| -rwxr-xr-x | tools/auto-qa | 1 |
6 files changed, 10 insertions, 37 deletions
@@ -725,19 +725,16 @@ for section in $HOST_OPTIONS_SECTIONS; do touch ${RESULT_DIR}/check_dmesg fi if [ "$DUMP_OUTPUT" = true ]; then - ./$seq 2>&1 | tee $tmp.rawout + ./$seq 2>&1 | tee $tmp.out # Because $? would get tee's return code sts=${PIPESTATUS[0]} else - ./$seq >$tmp.rawout 2>&1 + ./$seq >$tmp.out 2>&1 sts=$? fi $timestamp && _timestamp stop=`_wallclock` - _fix_malloc <$tmp.rawout >$tmp.out - rm -f $tmp.rawout - if [ -f core ] then _err_msg="[dumped core]" diff --git a/common/log b/common/log index b48f6abade..7a0a5f1f3b 100644 --- a/common/log +++ b/common/log @@ -107,7 +107,6 @@ BEGIN { _filter_logprint() { - _fix_malloc |\ sed ' s/ver:[0-9]/ver:<VERS>/; s/version [0-9] format [0-9]/version <VERS> format <FORMAT>/; @@ -1169,27 +1169,6 @@ _get_pids_by_name() -e "/[0-9]:[0-9][0-9] *$1 /s/ .*//p" } -# fix malloc libs output -# -_fix_malloc() -{ - # filter out the Electric Fence notice - $PERL_PROG -e ' - while (<>) { - if (defined $o && /^\s+Electric Fence/) { - chomp($o); - print "$o"; - undef $o; - next; - } - print $o if (defined $o); - - $o=$_; - } - print $o if (defined $o); - ' -} - # # _df_device : get an IRIX style df line for a given device # @@ -1372,7 +1351,7 @@ _do() (eval "echo '---' \"$cmd\"") >>$seqres.full (eval "$cmd") >$tmp._out 2>&1 local ret=$? - cat $tmp._out | _fix_malloc >>$seqres.full + cat $tmp._out >>$seqres.full rm -f $tmp._out if [ $# -eq 2 ]; then if [ $ret -eq 0 ]; then diff --git a/common/xfs b/common/xfs index e0bc3f43d3..92223513d5 100644 --- a/common/xfs +++ b/common/xfs @@ -393,8 +393,7 @@ _check_xfs_filesystem() # option (-t) to avoid indexing the free space trees doesn't make it pass on # large filesystems. Avoid it. if [ "$LARGE_SCRATCH_DEV" != yes ]; then - _xfs_check $extra_log_options $device 2>&1 |\ - _fix_malloc >$tmp.fs_check + _xfs_check $extra_log_options $device 2>&1 > $tmp.fs_check fi if [ -s $tmp.fs_check ]; then _log_err "_check_xfs_filesystem: filesystem on $device is inconsistent (c)" @@ -409,7 +408,7 @@ _check_xfs_filesystem() if [ $? -ne 0 ]; then _log_err "_check_xfs_filesystem: filesystem on $device is inconsistent (r)" echo "*** xfs_repair -n output ***" >>$seqres.full - cat $tmp.repair | _fix_malloc >>$seqres.full + cat $tmp.repair >>$seqres.full echo "*** end xfs_repair output" >>$seqres.full ok=0 @@ -422,7 +421,7 @@ _check_xfs_filesystem() if [ $? -ne 0 ]; then _log_err "_check_xfs_filesystem: filesystem on $device is inconsistent (rebuild)" echo "*** xfs_repair output ***" >>$seqres.full - cat $tmp.repair | _fix_malloc >>$seqres.full + cat $tmp.repair >>$seqres.full echo "*** end xfs_repair output" >>$seqres.full ok=0 @@ -433,7 +432,7 @@ _check_xfs_filesystem() if [ $? -ne 0 ]; then _log_err "_check_xfs_filesystem: filesystem on $device is inconsistent (rebuild-reverify)" echo "*** xfs_repair -n output ***" >>$seqres.full - cat $tmp.repair | _fix_malloc >>$seqres.full + cat $tmp.repair >>$seqres.full echo "*** end xfs_repair output" >>$seqres.full ok=0 @@ -85,11 +85,11 @@ _log "*** (`date`)" _log " *** init" _log " *** unmounting scratch device" -_scratch_unmount 2>&1 | _fix_malloc >>$FULL +_scratch_unmount 2>&1 >>$FULL _log " *** clean scratch device" -mkfs_xfs -f $SCRATCH_DEV 2>&1 | _fix_malloc >>$FULL \ +mkfs_xfs -f $SCRATCH_DEV 2>&1 >>$FULL \ || _fail " !!! failed to mkfs SCRATCH_DEV" pass=1 @@ -124,7 +124,7 @@ do _log " *** stress" ltp/fsstress -d $SCRATCH_MNT/soak_test -p $proc -n $stress $FSSTRESS_AVOID 2>&1 | \ - _fix_malloc >>$FULL + >>$FULL _log " *** unmounting scratch device" diff --git a/tools/auto-qa b/tools/auto-qa index 8d8f5ef9fb..b81b0b5960 100755 --- a/tools/auto-qa +++ b/tools/auto-qa @@ -340,7 +340,6 @@ do [ -d $WORKAREA/$pkg ] || continue cd $WORKAREA/$pkg - # use e-fence - but this will only take effect on configure make configure 2>&1 \ || _fail " !!! configure $pkg failed" make default 2>&1 \ |