Merging upstream version 1:9.18.24.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 24 insertions, 24 deletions

diff --git a/tests/unit-test-driver.sh.in b/tests/unit-test-driver.sh.in
index 9a60db1..1d35b0e 100644
--- a/tests/unit-test-driver.sh.in
+++ b/tests/unit-test-driver.sh.in
@@ -15,8 +15,8 @@ TOP_BUILDDIR=@abs_top_builddir@
 TOP_SRCDIR=@abs_top_srcdir@
 
 if [ -z "${1}" ]; then
-    echo "Usage: ${0} test_program" >&2
-    exit 1
+  echo "Usage: ${0} test_program" >&2
+  exit 1
 fi
 
 TEST_PROGRAM="${1}"
@@ -26,35 +26,35 @@ TIMEOUT=300
 TEST_PROGRAM_PID=${!}
 STATUS=124
 while [ ${TIMEOUT} -gt 0 ]; do
-	if ! kill -0 "${TEST_PROGRAM_PID}" 2>/dev/null; then
-		wait "${TEST_PROGRAM_PID}"
-		STATUS=${?}
-		break
-	fi
-	sleep 1
-	TIMEOUT=$((TIMEOUT - 1))
+  if ! kill -0 "${TEST_PROGRAM_PID}" 2>/dev/null; then
+    wait "${TEST_PROGRAM_PID}"
+    STATUS=${?}
+    break
+  fi
+  sleep 1
+  TIMEOUT=$((TIMEOUT - 1))
 done
 if [ ${TIMEOUT} -eq 0 ]; then
-	echo "PID ${TEST_PROGRAM_PID} exceeded run time limit, sending SIGABRT" >&2
-	kill -ABRT "${TEST_PROGRAM_PID}" 2>/dev/null
+  echo "PID ${TEST_PROGRAM_PID} exceeded run time limit, sending SIGABRT" >&2
+  kill -ABRT "${TEST_PROGRAM_PID}" 2>/dev/null
 fi
 
 TEST_PROGRAM_NAME=$(basename "${TEST_PROGRAM}")
 TEST_PROGRAM_WORK_DIR=$(dirname "${TEST_PROGRAM}")
 find "${TEST_PROGRAM_WORK_DIR}" -name 'core*' -or -name '*.core' | while read -r CORE_DUMP; do
-    BINARY=$(gdb --batch --core="${CORE_DUMP}" 2>/dev/null | sed -n "s/^Core was generated by \`\(.*\)'\.\$/\1/p")
-    if ! echo "${BINARY}" | grep -q "${TEST_PROGRAM_NAME}\$"; then
-        continue
-    fi
-    echo "I:${TEST_PROGRAM_NAME}:Core dump found: ${CORE_DUMP}"
-    echo "D:${TEST_PROGRAM_NAME}:backtrace from ${CORE_DUMP} start"
-    "${TOP_BUILDDIR}/libtool" --mode=execute gdb \
-                              --batch \
-                              --command="${TOP_SRCDIR}/bin/tests/system/run.gdb" \
-                              --core="${CORE_DUMP}" \
-                              -- \
-                              "${BINARY}"
-    echo "D:${TEST_PROGRAM_NAME}:backtrace from ${CORE_DUMP} end"
+  BINARY=$(gdb --batch --core="${CORE_DUMP}" 2>/dev/null | sed -n "s/^Core was generated by \`\(.*\)'\.\$/\1/p")
+  if ! echo "${BINARY}" | grep -q "${TEST_PROGRAM_NAME}\$"; then
+    continue
+  fi
+  echo "I:${TEST_PROGRAM_NAME}:Core dump found: ${CORE_DUMP}"
+  echo "D:${TEST_PROGRAM_NAME}:backtrace from ${CORE_DUMP} start"
+  "${TOP_BUILDDIR}/libtool" --mode=execute gdb \
+    --batch \
+    --command="${TOP_SRCDIR}/bin/tests/system/run.gdb" \
+    --core="${CORE_DUMP}" \
+    -- \
+    "${BINARY}"
+  echo "D:${TEST_PROGRAM_NAME}:backtrace from ${CORE_DUMP} end"
 done
 
 exit ${STATUS}