mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-08-22 09:57:41 +00:00
Code Issues Releases Wiki Activity

[#1574] remove the last unintended set +e

Browse Source
This commit is contained in:
Andrei Pavel 2020-12-13 20:22:54 +02:00
parent da104f1d03
commit 49d8ce20dd
No known key found for this signature in database
GPG Key ID: 86E9385BC2203766
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tools/tests_in_valgrind.sh
View File

@ -45,7 +45,8 @@ FAILED=
# Find all the tests (yes, doing it by a name is a nasty hack) # Find all the tests (yes, doing it by a name is a nasty hack)
# Since the while runs in a subprocess, we need to get the assignments out, done by the eval # Since the while runs in a subprocess, we need to get the assignments out, done by the eval
find . -type f -name '*_unittests' -print | grep -Fv '.libs/' | while read -r testname ; do set -x
for testname in $(find . -type f -name '*_unittests' -print | grep -Fv '.libs/'); do
sed -e 's#exec "#exec valgrind '"$FLAGS"' "#' "$testname" > "$testname.valgrind" sed -e 's#exec "#exec valgrind '"$FLAGS"' "#' "$testname" > "$testname.valgrind"
chmod +x "$testname.valgrind" chmod +x "$testname.valgrind"
echo "$testname" >>"$LOGFILE" echo "$testname" >>"$LOGFILE"
@ -54,23 +55,19 @@ find . -type f -name '*_unittests' -print | grep -Fv '.libs/' | while read -r te
cd "$(dirname "$testname")" cd "$(dirname "$testname")"
"./$(basename "$testname").valgrind" >&2 & "./$(basename "$testname").valgrind" >&2 &
PID="$!" PID="$!"
set +e
wait "$PID"
CODE="$?"
set -e
cd "$OLDDIR" cd "$OLDDIR"
if [ "$CODE" != 0 ] ; then if ! wait "$PID"; then
printf 'FAILED="%s printf 'FAILED="%s
%s"' "${FAILED}" "${testname}" %s"' "${FAILED}" "${testname}"
fi fi
NAME="$LOGFILE.$PID" NAME="$LOGFILE.$PID"
rm "$testname.valgrind" rm "$testname.valgrind"
# Remove the ones from death tests # Remove the ones from death tests
if [ -e "${NAME}" ]; then if test -e "${NAME}"; then
grep "==$PID==" "$NAME" >>"$LOGFILE" grep "==$PID==" "$NAME" >>"$LOGFILE"
rm "$NAME" rm "$NAME"
fi fi
echo 'FOUND_ANY=true' FOUND_ANY=true
done done
if test -n "$FAILED"; then if test -n "$FAILED"; then
@ -78,7 +75,7 @@ if test -n "$FAILED"; then
echo "$FAILED" >&2 echo "$FAILED" >&2
fi fi
if ! $FOUND_ANY ; then if ! $FOUND_ANY; then
echo "No test was found. It is possible you configured without --with-gtest or you run it from wrong directory" >&2 echo "No test was found. It is possible you configured without --with-gtest or you run it from wrong directory" >&2
exit 1 exit 1
fi fi