diff options
author | Jesús González <jgonzalez@gdr-sistemas.com> | 2015-06-01 23:14:07 +0200 |
---|---|---|
committer | Jesús González <jgonzalez@gdr-sistemas.com> | 2015-06-01 23:14:07 +0200 |
commit | b7778d2853d781998a4c6e8733c9cf76b7b6588e (patch) | |
tree | bec777cb0e55e436a3a62ab88564895f6494acce /tests/scripts/unity-compositor-command.conf | |
parent | 1afa5d0f606763524225dea9c5d0a953f808adf7 (diff) | |
parent | 89c9af9a315de9d88cac40e15f08899ad78b9bf7 (diff) | |
download | lightdm-b7778d2853d781998a4c6e8733c9cf76b7b6588e.tar.gz |
Merged parent branch
Diffstat (limited to 'tests/scripts/unity-compositor-command.conf')
-rw-r--r-- | tests/scripts/unity-compositor-command.conf | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/scripts/unity-compositor-command.conf b/tests/scripts/unity-compositor-command.conf index dfdede5e..204ea24d 100644 --- a/tests/scripts/unity-compositor-command.conf +++ b/tests/scripts/unity-compositor-command.conf @@ -15,17 +15,17 @@ unity-compositor-command=unity-system-compositor --test #?*UNITY-SYSTEM-COMPOSITOR READY # X server starts -#?XSERVER-0 START SEAT=seat0 MIR-ID=x-0 +#?XMIR-0 START SEAT=seat0 MIR-ID=x-0 # Daemon connects when X server is ready -#?*XSERVER-0 INDICATE-READY -#?XSERVER-0 INDICATE-READY -#?XSERVER-0 ACCEPT-CONNECT +#?*XMIR-0 INDICATE-READY +#?XMIR-0 INDICATE-READY +#?XMIR-0 ACCEPT-CONNECT # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter #?LOGIN1 ACTIVATE-SESSION SESSION=c0 -#?XSERVER-0 ACCEPT-CONNECT +#?XMIR-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON #?GREETER-X-0 CONNECTED-TO-DAEMON @@ -36,6 +36,6 @@ unity-compositor-command=unity-system-compositor --test # Cleanup #?*STOP-DAEMON #?GREETER-X-0 TERMINATE SIGNAL=15 -#?XSERVER-0 TERMINATE SIGNAL=15 +#?XMIR-0 TERMINATE SIGNAL=15 #?UNITY-SYSTEM-COMPOSITOR TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 |