Commit 098e2f2a authored by Sam Thursfield's avatar Sam Thursfield

tests: Use dbus-run-session instead of dbus-launch

This also fixes an issue in the functional-test runner script which caused
failed tests to appear as if they succeeded.

See #44
parent 161ad634
Pipeline #65603 passed with stage
in 1 minute and 7 seconds
......@@ -27,7 +27,7 @@ test-fedora-latest:
# screenful of junk each time unless we strip these.
unset $(env|grep -o '^CI_[^=]*')
su tracker -c 'cd build; LANG=en_US.UTF8 dbus-launch meson test --suite tracker-miners --print-errorlogs'
su tracker -c 'cd build; dbus-run-session -- env LANG=en_US.UTF8 meson test --suite tracker-miners --print-errorlogs'
artifacts:
when: always
......
......@@ -6,8 +6,6 @@ set -e
SCRIPT=$1
DBUS_SESSION_BUS_PID=
export TEMP_DIR=`mktemp --tmpdir -d tracker-test-XXXX`
# We need to use the actual home directory for some tests because
......@@ -18,13 +16,6 @@ export REAL_HOME=`echo ~`
# in the filesystem
HOME=$TEMP_DIR
eval `dbus-launch --sh-syntax`
trap "/bin/kill $DBUS_SESSION_BUS_PID; exit" INT ERR
echo "Running $@"
$@
kill $DBUS_SESSION_BUS_PID
dbus-run-session $@
rm -R $TEMP_DIR
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment