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>
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]"
_filter_logprint()
{
- _fix_malloc |\
sed '
s/ver:[0-9]/ver:<VERS>/;
s/version [0-9] format [0-9]/version <VERS> format <FORMAT>/;
-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
#
(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
# 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)"
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
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
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
_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
_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"
[ -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 \