iovxw/android_vendor_hardware_overlay
1
0
Fork 0
forked from PeterGSI/android_vendor_hardware_overlay
Code Issues Pull requests Projects Releases Wiki Activity

Refactor fails into a fail command

Browse source
This commit is contained in:
Pierre-Hugues Husson 2018-11-03 21:06:02 +01:00
parent ad1795f6ed
commit 5cf903354f
2 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tests/knownKeys
View file

@ -94,3 +94,5 @@ navigation_bar_width
notification_header_padding_top
notification_header_padding_bottom
config_fillMainBuiltInDisplayCutout
config_dozeAfterScreenOff
config_autoBrightnessAmbientLightHorizon

31
tests/tests.sh
View file

@ -3,6 +3,16 @@
base="$(dirname "$(readlink -f -- $0)")/.."
cd $base
#Usage: fail <file> <message> [ignore string]
fail() {
if [ -z "$3" ] || ! grep -qF "$3" "$1";then
echo "F: $1: $2"
touch fail
else
echo "W: $1: $2"
fi
}
#Keep knownKeys
rm -f tests/priorities fail
touch tests/priorities tests/knownKeys
@ -11,8 +21,7 @@ find -name AndroidManifest.xml |while read manifest;do
#Ensure this overlay doesn't override blacklist-ed properties
for b in $(cat tests/blacklist);do
if grep -qRF "$b" $folder;then
echo "Overlay $folder is defining $b which is forbidden"
touch fail
fail $folder "Overlay $folder is defining $b which is forbidden"
fi
done
@ -23,15 +32,14 @@ find -name AndroidManifest.xml |while read manifest;do
#Ensure priorities unique-ness
priority="$(xmlstarlet sel -t -m '//overlay' -v @android:priority -n $manifest)"
if grep -qE '^'$priority'$' tests/priorities;then
echo $manifest priority $priority conflicts with another manifest
touch fail
fail $manifest "priority $priority conflicts with another manifest"
fi
echo $priority >> tests/priorities
systemPropertyName="$(xmlstarlet sel -t -m '//overlay' -v @android:requiredSystemPropertyName -n $manifest)"
if [ "$systemPropertyName" == "ro.vendor.product.name" ];then
echo "$manifest: ro.vendor.product.name is deprecated. Please use ro.vendor.build.fingerprint"
touch fail
fail "$manifest" "ro.vendor.product.name is deprecated. Please use ro.vendor.build.fingerprint" \
'TESTS: Ignore ro.vendor.product.name'
fi
#Ensure the overloaded properties exist in AOSP
@ -46,18 +54,15 @@ find -name AndroidManifest.xml |while read manifest;do
ag '"'$key'"' /build/AOSP-8.1/frameworks/base/core/res/res)> /dev/null ;then
echo $key >> tests/knownKeys
else
echo $xml defines a non-existing attribute $key
touch fail
fail "$xml" "defines a non-existing attribute $key"
fi
done
done
done
rm -f tests/priorities
if find -name \*.xml |xargs dos2unix -ic |grep -qE .;then
echo "The following files have dos end of lines"
find -name \*.xml |xargs dos2unix -ic
touch fail
fi
find -name \*.xml |xargs dos2unix -ic |while read f;do
fail $f "File is DOS type"
done
if [ -f fail ];then exit 1; fi