test01_pkgquality: avoid use of pipes

Signed-off-by: Davide Madrisan <davide.madrisan@gmail.com>
This commit is contained in:
Davide Madrisan 2012-01-18 00:09:22 +01:00
parent e7cefb0ed0
commit e77d5e88a3
2 changed files with 21 additions and 17 deletions

View File

@ -65,6 +65,10 @@ Sun Jan 15 2012 Davide Madrisan <davide.madrisan(a)gmail.com>
* pck-update - Davide Madrisan: * pck-update - Davide Madrisan:
Print the list of packages before running the tests. Print the list of packages before running the tests.
+ bugfix
* tests/test01_pkgquality - Davide Madrisan:
Avoid pipes otherwise the error counter will not display a correct value.
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
Changes in version 1.8.2 Changes in version 1.8.2

View File

@ -116,18 +116,18 @@ wrong symlink"": \`${NOTE}${f/./}${NORM}' --> \`${NOTE}$(readlink $f)${NORM}'"
let "i = 0" let "i = 0"
for pck in ${rpmpkg_name[@]}; do for pck in ${rpmpkg_name[@]}; do
find $tmpextractdir/$i -type f \ pushd $tmpextractdir/$i >/dev/null
-exec grep -ls "$SPEC_BUILDROOT" {} \; | \ for f in $(find -type f \
while read filename; do -exec grep -ls "$SPEC_BUILDROOT" {} \;2>/dev/null); do
notify.warning "${NOTE}${pck##*/}${NORM}" notify.warning "${NOTE}${pck##*/}${NORM}"
notify.note "\ notify.note "\
${NOTE}$(\ ${NOTE}$(echo $f | sed "s,$tmpextractdir/$i,," )${NORM}"
echo $filename | sed "s,$tmpextractdir/$i,," )${NORM}"
notify.note "$(\ notify.note "$(\
strings -a $filename | grep "^$SPEC_BUILDROOT" | sort -bu | \ strings -a $f | grep "^$SPEC_BUILDROOT" | sort -bu | \
sed "s,$SPEC_BUILDROOT\(.*\), - [%buildroot]\1,")" sed "s,$SPEC_BUILDROOT\(.*\), - [%buildroot]\1,")"
let "total_issues += 1" let "total_issues += 1"
done done
popd >/dev/null
let "i += 1" let "i += 1"
done done
fi fi
@ -142,18 +142,18 @@ sed "s,$SPEC_BUILDROOT\(.*\), - [%buildroot]\1,")"
let "i = 0" let "i = 0"
for pck in ${rpmpkg_name[@]}; do for pck in ${rpmpkg_name[@]}; do
find $tmpextractdir/$i -type f \ pushd $tmpextractdir/$i >/dev/null
-exec grep -ls "$BUILDDIR" {} \; | \ for f in $(find -type f \
while read filename; do -exec grep -ls "$BUILDDIR" {} \; 2>/dev/null); do
notify.warning "${NOTE}${pck##*/}${NORM}" notify.warning "${NOTE}${pck##*/}${NORM}"
notify.note "\ notify.note "\
${NOTE}$(\ ${NOTE}$(echo $f | sed "s,$tmpextractdir/$i,," )${NORM}"
echo $filename | sed "s,$tmpextractdir/$i,," )${NORM}"
notify.note "$(\ notify.note "$(\
strings -a $filename | grep "$BUILDDIR" | sort -bu | \ strings -a $f | grep "$BUILDDIR" | sort -bu | \
sed "s,$BUILDDIR,[%_builddir],g;s,.*, - &,")" sed "s,$BUILDDIR,[%_builddir],g;s,.*, - &,")"
let "total_issues += 1" let "total_issues += 1"
done done
popd >/dev/null
let "i += 1" let "i += 1"
done done