From ed37f0636bf9f4e2cf6a3fbfe6362b61f8c4d6b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
Date: Thu, 12 Jul 2018 21:02:16 +0200
Subject: [PATCH] run.in: Always use exec
Otherwise we can't determine the PID of the main process and
can't kill it properly during tests
---
run.in | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/run.in b/run.in
index 439df88..c76a7c6 100755
--- a/run.in
+++ b/run.in
@@ -1,11 +1,10 @@
#!/bin/sh
set -e
-EXEC="${EXEC:-exec}"
if [ "${PHOSH_VALGRIND}" = 1 ]; then
echo "Running phosh under valgrind"
- EXEC="valgrind --tool=memcheck --leak-check=full --leak-resolution=high --num-callers=20 --log-file=vgdump"
+ WRAPPER="valgrind --tool=memcheck --leak-check=full --leak-resolution=high --num-callers=20 --log-file=vgdump"
fi
ABS_BUILDDIR='@ABS_BUILDDIR@'
@@ -16,4 +15,4 @@ gnome-session --session=gnome-dummy --disable-acceleration-check &
export GSETTINGS_SCHEMA_DIR="${ABS_BUILDDIR}/data"
export G_MESSAGES_DEBUG=all
set -x
-${EXEC} "${ABS_BUILDDIR}/src/phosh" $@
+exec ${WRAPPER} "${ABS_BUILDDIR}/src/phosh" $@
--
GitLab