apfs/apfstests
0
0
Fork 0
mirror of https://github.com/linux-apfs/apfstests.git synced 2026-05-01 15:01:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

fstests: remove old electric fence support

Browse Source 
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>
This commit is contained in:
Dave Chinner
2018-05-07 08:45:31 +10:00
committed by Eryu Guan
parent 5509684db3
commit 46199319f6
6 changed files with 10 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
check
+2 -5
View File
@@ -725,19 +725,16 @@ for section in $HOST_OPTIONS_SECTIONS; do
touch ${RESULT_DIR}/check_dmesg touch ${RESULT_DIR}/check_dmesg
fi fi
if [ "$DUMP_OUTPUT" = true ]; then if [ "$DUMP_OUTPUT" = true ]; then
./$seq 2>&1 | tee $tmp.rawout ./$seq 2>&1 | tee $tmp.out
# Because $? would get tee's return code # Because $? would get tee's return code
sts=${PIPESTATUS[0]} sts=${PIPESTATUS[0]}
else else
./$seq >$tmp.rawout 2>&1 ./$seq >$tmp.out 2>&1
sts=$? sts=$?
fi fi
$timestamp && _timestamp $timestamp && _timestamp
stop=`_wallclock` stop=`_wallclock`
_fix_malloc <$tmp.rawout >$tmp.out
rm -f $tmp.rawout
if [ -f core ] if [ -f core ]
then then
_err_msg="[dumped core]" _err_msg="[dumped core]"
common/log
-1
View File
@@ -107,7 +107,6 @@ BEGIN {
_filter_logprint() _filter_logprint()
{ {
_fix_malloc |\
sed ' sed '
s/ver:[0-9]/ver:<VERS>/; s/ver:[0-9]/ver:<VERS>/;
s/version [0-9] format [0-9]/version <VERS> format <FORMAT>/; s/version [0-9] format [0-9]/version <VERS> format <FORMAT>/;
common/rc
+1 -22
View File
@@ -1169,27 +1169,6 @@ _get_pids_by_name()
-e "/[0-9]:[0-9][0-9] *$1 /s/ .*//p" -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 # _df_device : get an IRIX style df line for a given device
# #
@@ -1372,7 +1351,7 @@ _do()
(eval "echo '---' \"$cmd\"") >>$seqres.full (eval "echo '---' \"$cmd\"") >>$seqres.full
(eval "$cmd") >$tmp._out 2>&1 (eval "$cmd") >$tmp._out 2>&1
local ret=$? local ret=$?
cat $tmp._out | _fix_malloc >>$seqres.full cat $tmp._out >>$seqres.full
rm -f $tmp._out rm -f $tmp._out
if [ $# -eq 2 ]; then if [ $# -eq 2 ]; then
if [ $ret -eq 0 ]; then if [ $ret -eq 0 ]; then
common/xfs
+4 -5
View File
@@ -393,8 +393,7 @@ _check_xfs_filesystem()
# option (-t) to avoid indexing the free space trees doesn't make it pass on # option (-t) to avoid indexing the free space trees doesn't make it pass on
# large filesystems. Avoid it. # large filesystems. Avoid it.
if [ "$LARGE_SCRATCH_DEV" != yes ]; then if [ "$LARGE_SCRATCH_DEV" != yes ]; then
_xfs_check $extra_log_options $device 2>&1 |\ _xfs_check $extra_log_options $device 2>&1 > $tmp.fs_check
_fix_malloc >$tmp.fs_check
fi fi
if [ -s $tmp.fs_check ]; then if [ -s $tmp.fs_check ]; then
_log_err "_check_xfs_filesystem: filesystem on $device is inconsistent (c)" _log_err "_check_xfs_filesystem: filesystem on $device is inconsistent (c)"
@@ -409,7 +408,7 @@ _check_xfs_filesystem()
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
_log_err "_check_xfs_filesystem: filesystem on $device is inconsistent (r)" _log_err "_check_xfs_filesystem: filesystem on $device is inconsistent (r)"
echo "*** xfs_repair -n output ***" >>$seqres.full 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 echo "*** end xfs_repair output" >>$seqres.full
ok=0 ok=0
@@ -422,7 +421,7 @@ _check_xfs_filesystem()
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
_log_err "_check_xfs_filesystem: filesystem on $device is inconsistent (rebuild)" _log_err "_check_xfs_filesystem: filesystem on $device is inconsistent (rebuild)"
echo "*** xfs_repair output ***" >>$seqres.full 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 echo "*** end xfs_repair output" >>$seqres.full
ok=0 ok=0
@@ -433,7 +432,7 @@ _check_xfs_filesystem()
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
_log_err "_check_xfs_filesystem: filesystem on $device is inconsistent (rebuild-reverify)" _log_err "_check_xfs_filesystem: filesystem on $device is inconsistent (rebuild-reverify)"
echo "*** xfs_repair -n output ***" >>$seqres.full 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 echo "*** end xfs_repair output" >>$seqres.full
ok=0 ok=0
soak
+3 -3
View File
@@ -85,11 +85,11 @@ _log "*** (`date`)"
_log " *** init" _log " *** init"
_log " *** unmounting scratch device" _log " *** unmounting scratch device"
_scratch_unmount 2>&1 | _fix_malloc >>$FULL _scratch_unmount 2>&1 >>$FULL
_log " *** clean scratch device" _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" || _fail " !!! failed to mkfs SCRATCH_DEV"
pass=1 pass=1
@@ -124,7 +124,7 @@ do
_log " *** stress" _log " *** stress"
ltp/fsstress -d $SCRATCH_MNT/soak_test -p $proc -n $stress $FSSTRESS_AVOID 2>&1 | \ ltp/fsstress -d $SCRATCH_MNT/soak_test -p $proc -n $stress $FSSTRESS_AVOID 2>&1 | \
_fix_malloc >>$FULL >>$FULL
_log " *** unmounting scratch device" _log " *** unmounting scratch device"
tools/auto-qa
-1
View File
@@ -340,7 +340,6 @@ do
[ -d $WORKAREA/$pkg ] || continue [ -d $WORKAREA/$pkg ] || continue
cd $WORKAREA/$pkg cd $WORKAREA/$pkg
# use e-fence - but this will only take effect on configure
make configure 2>&1 \ make configure 2>&1 \
|| _fail " !!! configure $pkg failed" || _fail " !!! configure $pkg failed"
make default 2>&1 \ make default 2>&1 \