summaryrefslogtreecommitdiff
path: root/test/test-dbus-launch-x11.sh
Commit message (Collapse)AuthorAgeFilesLines
* tests: Don't exercise GetMachineId() or autolaunch if no machine IDSimon McVittie2017-06-081-0/+11
| | | | | | | | | | | | | | | | | | | | At the moment there is a hack in the implementation of GetMachineId() to stop tests from failing during "make check" on a system where dbus has never been installed, by silently generating a new unique fake "machine ID" for each process. I'm about to change that behaviour to report errors properly; skip affected test-cases if we can't read the real machine ID. The shell scripts to test dbus-launch are run both as "make check" tests (for which it is valid for dbus to be not correctly installed) and as installed-tests (for which that is not valid), so make them pass during "make check" but fail during installed testing. The tests in bus/ and test/name-test/ are only run during "make check" so they only have the code path where they are skipped. Signed-off-by: Simon McVittie <smcv@collabora.com> Reviewed-by: Philip Withnall <withnall@endlessm.com> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=13194
* Ensure hyphen/minus is treated as literal in regexesSimon McVittie2017-04-181-1/+1
| | | | | | | | | | | | | | | | | | Each U+002D HYPHEN-MINUS in [0-9A-Za-z_-/.\] is treated as a member of a range. The third one, which appears to have been intended to be a literal, is part of an empty range because the starting point U+005F LOW LINE is greater than the endpoint U+002F SOLIDUS, resulting in at least some grep implementations not considering U+002D, U+002F or U+005F to match the pattern. This resulted in one of the dbus-launch tests being unintentionally skipped when it used a regex based on the one in the spec. regex(7) suggests "To include a literal '-' [in a bracketed character set], make it the first or last character". Signed-off-by: Simon McVittie <smcv@collabora.com> Reviewed-by: Philip Withnall <withnall@endlessm.com> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=100686
* test-dbus-launch-x11: extend to cover --exit-with-x11Simon McVittie2016-08-121-4/+6
| | | | Signed-off-by: Simon McVittie <smcv@debian.org>
* Add a regression test for dbus-launch in X11Simon McVittie2016-08-121-0/+254
Signed-off-by: Simon McVittie <smcv@debian.org> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=97008