ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "fs_mgr: overlay: test is alarming on legacy eng builds."

Browse source 
am: 605eab93c6

Change-Id: Ie0fa127f60f388e46f800f716ec3f1a0d286a9af
This commit is contained in:
Mark Salyzyn 2019-03-22 11:21:32 -07:00 • committed by android-build-merger
commit 91c0da306e
1 changed files with 27 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
fs_mgr/tests/adb-remount-test.sh
View file

@ -447,59 +447,71 @@ die() {
exit 1 exit 1
} }
[ "USAGE: EXPECT_EQ <lval> <rval> [message] [ "USAGE: EXPECT_EQ <lval> <rval> [--warning [message]]
Returns true if (regex) lval matches rval" ] Returns true if (regex) lval matches rval" ]
EXPECT_EQ() { EXPECT_EQ() {
local lval="${1}" local lval="${1}"
local rval="${2}" local rval="${2}"
shift 2 shift 2
local error=1
local prefix="${RED}[ ERROR ]${NORMAL}"
if [ X"${1}" = X"--warning" ]; then
prefix="${RED}[ WARNING ]${NORMAL}"
error=0
shift 1
fi
if ! ( echo X"${rval}" | grep '^X'"${lval}"'$' >/dev/null 2>/dev/null ); then if ! ( echo X"${rval}" | grep '^X'"${lval}"'$' >/dev/null 2>/dev/null ); then
if [ `echo ${lval}${rval}${*} | wc -c` -gt 50 -o "${rval}" != "${rval% if [ `echo ${lval}${rval}${*} | wc -c` -gt 50 -o "${rval}" != "${rval%
*}" ]; then *}" ]; then
echo "ERROR: expected \"${lval}\"" >&2 echo "${prefix} expected \"${lval}\"" >&2
echo " got \"${rval}\"" | echo "${prefix} got \"${rval}\"" |
sed ': again sed ': again
N N
s/\(\n\)\([^ ]\)/\1 \2/ s/\(\n\)\([^ ]\)/\1 \2/
t again' >&2 t again' >&2
if [ -n "${*}" ] ; then if [ -n "${*}" ] ; then
echo " ${*}" >&2 echo "${prefix} ${*}" >&2
fi fi
else else
echo "ERROR: expected \"${lval}\" got \"${rval}\" ${*}" >&2 echo "${prefix} expected \"${lval}\" got \"${rval}\" ${*}" >&2
fi fi
return 1 return ${error}
fi fi
if [ -n "${*}" ] ; then if [ -n "${*}" ] ; then
if [ X"${lval}" != X"${rval}" ]; then prefix="${GREEN}[ INFO ]${NORMAL}"
if [ X"${lval}" != X"${rval}" ]; then # we were supplied a regex?
if [ `echo ${lval}${rval}${*} | wc -c` -gt 60 -o "${rval}" != "${rval% *}" ]; then if [ `echo ${lval}${rval}${*} | wc -c` -gt 60 -o "${rval}" != "${rval% *}" ]; then
echo "INFO: ok \"${lval}\"" >&2 echo "${prefix} ok \"${lval}\"" >&2
echo " = \"${rval}\"" | echo " = \"${rval}\"" |
sed ': again sed ': again
N N
s/\(\n\)\([^ ]\)/\1 \2/ s/\(\n\)\([^ ]\)/\1 \2/
t again' >&2 t again' >&2
if [ -n "${*}" ] ; then if [ -n "${*}" ] ; then
echo " ${*}" >&2 echo "${prefix} ${*}" >&2
fi fi
else else
echo "INFO: ok \"${lval}\" = \"${rval}\" ${*}" >&2 echo "${prefix} ok \"${lval}\" = \"${rval}\" ${*}" >&2
fi fi
else else
echo "INFO: ok \"${lval}\" ${*}" >&2 echo "${prefix} ok \"${lval}\" ${*}" >&2
fi fi
fi fi
return 0 return 0
} }
[ "USAGE: check_eq <lval> <rval> [message] [ "USAGE: check_eq <lval> <rval> [--warning [message]]
Exits if (regex) lval mismatches rval" ] Exits if (regex) lval mismatches rval" ]
check_eq() { check_eq() {
local lval="${1}" local lval="${1}"
local rval="${2}" local rval="${2}"
shift 2 shift 2
if [ X"${1}" = X"--warning" ]; then
EXPECT_EQ "${lval}" "${rval}" ${*}
return
fi
EXPECT_EQ "${lval}" "${rval}" || EXPECT_EQ "${lval}" "${rval}" ||
die "${@}" die "${@}"
} }
@ -1085,14 +1097,9 @@ else
check_eq "cat: /vendor/hello: No such file or directory" "${B}" \ check_eq "cat: /vendor/hello: No such file or directory" "${B}" \
vendor content after flash vendor vendor content after flash vendor
else else
( echo "${ORANGE}[ WARNING ]${NORMAL} user fastboot missing required to invalidate, ignoring a failure" >&2
echo "${ORANGE}[ WARNING ]${NORMAL} user fastboot missing required to invalidate, ignoring a failure" >&2 check_eq "cat: /vendor/hello: No such file or directory" "${B}" \
restore() { --warning vendor content after flash vendor
true
}
check_eq "cat: /vendor/hello: No such file or directory" "${B}" \
vendor content after flash vendor
)
fi fi
fi fi