diff options
| author | Robert Ancell <robert.ancell@canonical.com> | 2013-07-20 21:49:48 +1200 |
|---|---|---|
| committer | Robert Ancell <robert.ancell@canonical.com> | 2013-07-20 21:49:48 +1200 |
| commit | 2d2a06437782dde92611c3c4a005c071ce26b048 (patch) | |
| tree | 7cae2a6aa5af6d4e6b5a8ae934cca99b3ae0de9e | |
| parent | c18cba82f484a4f40a12e4635ac377dd76aa7643 (diff) | |
| download | lightdm-2d2a06437782dde92611c3c4a005c071ce26b048.tar.gz | |
Synchronise X server starting
130 files changed, 546 insertions, 359 deletions
diff --git a/tests/scripts/additional-config.conf b/tests/scripts/additional-config.conf index 204ab890..252906e1 100644 --- a/tests/scripts/additional-config.conf +++ b/tests/scripts/additional-config.conf @@ -12,9 +12,10 @@ user-session=default # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Session starts diff --git a/tests/scripts/autologin-guest-fail-setup-script.conf b/tests/scripts/autologin-guest-fail-setup-script.conf index c9573c9b..37b3ba1d 100644 --- a/tests/scripts/autologin-guest-fail-setup-script.conf +++ b/tests/scripts/autologin-guest-fail-setup-script.conf @@ -12,9 +12,10 @@ autologin-guest=true # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # (guest account attempts to start and fails) diff --git a/tests/scripts/autologin-guest-in-background.conf b/tests/scripts/autologin-guest-in-background.conf index 7dcea539..a6d36b94 100644 --- a/tests/scripts/autologin-guest-in-background.conf +++ b/tests/scripts/autologin-guest-in-background.conf @@ -14,6 +14,7 @@ user-session=default # Greeter starts #?XSERVER-0 START VT=7 +#?*XSERVER-0 INDICATE-READY #?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 START @@ -24,6 +25,7 @@ user-session=default # Guest session starts #?XSERVER-1 START VT=8 +#?*XSERVER-1 INDICATE-READY #?XSERVER-1 INDICATE-READY #?XSERVER-1 ACCEPT-CONNECT #?GUEST-ACCOUNT ADD USERNAME=guest-.* diff --git a/tests/scripts/autologin-guest-logout.conf b/tests/scripts/autologin-guest-logout.conf index aefb7fd4..f4beb558 100644 --- a/tests/scripts/autologin-guest-logout.conf +++ b/tests/scripts/autologin-guest-logout.conf @@ -13,9 +13,10 @@ user-session=default # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Guest account created @@ -37,9 +38,10 @@ user-session=default # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Greeter starts diff --git a/tests/scripts/autologin-guest-timeout.conf b/tests/scripts/autologin-guest-timeout.conf index 7342c5a2..1b813cf7 100644 --- a/tests/scripts/autologin-guest-timeout.conf +++ b/tests/scripts/autologin-guest-timeout.conf @@ -14,9 +14,10 @@ user-session=default # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Greeter starts diff --git a/tests/scripts/autologin-guest.conf b/tests/scripts/autologin-guest.conf index e7a1723b..7d288334 100644 --- a/tests/scripts/autologin-guest.conf +++ b/tests/scripts/autologin-guest.conf @@ -13,9 +13,10 @@ user-session=default # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Guest account created diff --git a/tests/scripts/autologin-in-background.conf b/tests/scripts/autologin-in-background.conf index 74f8b994..08511771 100644 --- a/tests/scripts/autologin-in-background.conf +++ b/tests/scripts/autologin-in-background.conf @@ -11,6 +11,7 @@ user-session=default # Greeter starts #?XSERVER-0 START VT=7 +#?*XSERVER-0 INDICATE-READY #?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 START @@ -21,6 +22,7 @@ user-session=default # Autologin session starts #?XSERVER-1 START VT=8 +#?*XSERVER-1 INDICATE-READY #?XSERVER-1 INDICATE-READY #?XSERVER-1 ACCEPT-CONNECT #?SESSION-X-1 START USER=have-password1 diff --git a/tests/scripts/autologin-invalid-session.conf b/tests/scripts/autologin-invalid-session.conf index 8e881a8b..ce05b417 100644 --- a/tests/scripts/autologin-invalid-session.conf +++ b/tests/scripts/autologin-invalid-session.conf @@ -10,9 +10,10 @@ user-session=invalid # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # (session fails to start) diff --git a/tests/scripts/autologin-invalid-user.conf b/tests/scripts/autologin-invalid-user.conf index 7ce9cc20..c781ca40 100644 --- a/tests/scripts/autologin-invalid-user.conf +++ b/tests/scripts/autologin-invalid-user.conf @@ -9,9 +9,10 @@ autologin-user=invalid # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # (fails to start session for invalid user) diff --git a/tests/scripts/autologin-logout.conf b/tests/scripts/autologin-logout.conf index 9588c9dc..daf63cf3 100644 --- a/tests/scripts/autologin-logout.conf +++ b/tests/scripts/autologin-logout.conf @@ -10,9 +10,10 @@ user-session=default # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Autologin session starts @@ -28,9 +29,10 @@ user-session=default # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Greeter starts diff --git a/tests/scripts/autologin-new-authtok.conf b/tests/scripts/autologin-new-authtok.conf index 1f66bfc8..18495847 100644 --- a/tests/scripts/autologin-new-authtok.conf +++ b/tests/scripts/autologin-new-authtok.conf @@ -9,9 +9,10 @@ autologin-user=new-authtok # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # (Session fails) diff --git a/tests/scripts/autologin-password.conf b/tests/scripts/autologin-password.conf index e742456f..2db187a3 100644 --- a/tests/scripts/autologin-password.conf +++ b/tests/scripts/autologin-password.conf @@ -9,9 +9,10 @@ autologin-user=always-password # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # (Session fails) diff --git a/tests/scripts/autologin-previous-session.conf b/tests/scripts/autologin-previous-session.conf index aba2eb04..909c7bbf 100644 --- a/tests/scripts/autologin-previous-session.conf +++ b/tests/scripts/autologin-previous-session.conf @@ -9,9 +9,10 @@ autologin-user=have-session # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Session starts diff --git a/tests/scripts/autologin-session-crash.conf b/tests/scripts/autologin-session-crash.conf index 242dc7c2..996ddb6f 100644 --- a/tests/scripts/autologin-session-crash.conf +++ b/tests/scripts/autologin-session-crash.conf @@ -10,9 +10,10 @@ user-session=default # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Session starts @@ -28,9 +29,10 @@ user-session=default # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Greeter starts diff --git a/tests/scripts/autologin-session-error.conf b/tests/scripts/autologin-session-error.conf index c0e2a26f..c42c053d 100644 --- a/tests/scripts/autologin-session-error.conf +++ b/tests/scripts/autologin-session-error.conf @@ -10,9 +10,10 @@ user-session=default # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # (Session fails) @@ -22,9 +23,10 @@ user-session=default # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Greeter starts diff --git a/tests/scripts/autologin-timeout-in-background.conf b/tests/scripts/autologin-timeout-in-background.conf index 9e3d8b6d..8ba1f6b3 100644 --- a/tests/scripts/autologin-timeout-in-background.conf +++ b/tests/scripts/autologin-timeout-in-background.conf @@ -12,6 +12,7 @@ user-session=default # Greeter starts #?XSERVER-0 START VT=7 +#?*XSERVER-0 INDICATE-READY #?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 START @@ -22,6 +23,7 @@ user-session=default # Autologin session starts #?XSERVER-1 START VT=8 +#?*XSERVER-1 INDICATE-READY #?XSERVER-1 INDICATE-READY #?XSERVER-1 ACCEPT-CONNECT #?SESSION-X-1 START USER=have-password1 diff --git a/tests/scripts/autologin-timeout.conf b/tests/scripts/autologin-timeout.conf index 31f7f608..af1d598d 100644 --- a/tests/scripts/autologin-timeout.conf +++ b/tests/scripts/autologin-timeout.conf @@ -11,9 +11,10 @@ user-session=default # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Greeter starts diff --git a/tests/scripts/autologin-xserver-crash.conf b/tests/scripts/autologin-xserver-crash.conf index 36ca845a..fc5ec049 100644 --- a/tests/scripts/autologin-xserver-crash.conf +++ b/tests/scripts/autologin-xserver-crash.conf @@ -10,9 +10,10 @@ user-session=default # XServer starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Session starts @@ -28,6 +29,7 @@ user-session=default # X server restarts #?XSERVER-0 START VT=7 +#?*XSERVER-0 INDICATE-READY #?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT diff --git a/tests/scripts/autologin.conf b/tests/scripts/autologin.conf index 6484f70d..de9a4905 100644 --- a/tests/scripts/autologin.conf +++ b/tests/scripts/autologin.conf @@ -10,9 +10,10 @@ user-session=default # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Session starts diff --git a/tests/scripts/cancel-authentication.conf b/tests/scripts/cancel-authentication.conf index 94f5e60c..ca4719a3 100644 --- a/tests/scripts/cancel-authentication.conf +++ b/tests/scripts/cancel-authentication.conf @@ -6,9 +6,10 @@ # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Greeter starts diff --git a/tests/scripts/change-authentication.conf b/tests/scripts/change-authentication.conf index a7b8fe6f..4a65dc0d 100644 --- a/tests/scripts/change-authentication.conf +++ b/tests/scripts/change-authentication.conf @@ -6,9 +6,10 @@ # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Greeter starts diff --git a/tests/scripts/console-kit.conf b/tests/scripts/console-kit.conf index 890770d5..a9a44bf2 100644 --- a/tests/scripts/console-kit.conf +++ b/tests/scripts/console-kit.conf @@ -13,9 +13,10 @@ user-session=default # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Session starts diff --git a/tests/scripts/crash-authenticate.conf b/tests/scripts/crash-authenticate.conf index 5d9143d7..7cd8cabf 100644 --- a/tests/scripts/crash-authenticate.conf +++ b/tests/scripts/crash-authenticate.conf @@ -9,9 +9,10 @@ autologin-user=crash-authenticate # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # (authentication crashes) diff --git a/tests/scripts/cred-error.conf b/tests/scripts/cred-error.conf index 9d44b3e1..39e2006c 100644 --- a/tests/scripts/cred-error.conf +++ b/tests/scripts/cred-error.conf @@ -10,9 +10,10 @@ user-session=default # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # (Session fails) @@ -22,9 +23,10 @@ user-session=default # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Greeter starts diff --git a/tests/scripts/cred-expired.conf b/tests/scripts/cred-expired.conf index 98cb0c3b..6c08c670 100644 --- a/tests/scripts/cred-expired.conf +++ b/tests/scripts/cred-expired.conf @@ -10,9 +10,10 @@ user-session=default # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # (Session fails) @@ -22,9 +23,10 @@ user-session=default # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Greeter starts diff --git a/tests/scripts/cred-unavail.conf b/tests/scripts/cred-unavail.conf index 82fcdb4b..14a96039 100644 --- a/tests/scripts/cred-unavail.conf +++ b/tests/scripts/cred-unavail.conf @@ -10,9 +10,10 @@ user-session=default # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # (Session fails) @@ -22,9 +23,10 @@ user-session=default # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Greeter starts diff --git a/tests/scripts/dbus.conf b/tests/scripts/dbus.conf index 7451d121..5f6cd8fc 100644 --- a/tests/scripts/dbus.conf +++ b/tests/scripts/dbus.conf @@ -9,9 +9,10 @@ user-session=default # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Greeter starts diff --git a/tests/scripts/denied.conf b/tests/scripts/denied.conf index 0ead01e0..42e14d5a 100644 --- a/tests/scripts/denied.conf +++ b/tests/scripts/denied.conf @@ -9,9 +9,10 @@ autologin-user=denied # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # (Session fails) diff --git a/tests/scripts/expired.conf b/tests/scripts/expired.conf index 11eed1d3..f4a5c823 100644 --- a/tests/scripts/expired.conf +++ b/tests/scripts/expired.conf @@ -9,9 +9,10 @@ autologin-user=expired # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # (Session fails) diff --git a/tests/scripts/greeter-fail-start.conf b/tests/scripts/greeter-fail-start.conf index aa49ba43..1d99fbf8 100644 --- a/tests/scripts/greeter-fail-start.conf +++ b/tests/scripts/greeter-fail-start.conf @@ -9,9 +9,10 @@ return-value=1 # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Greeter fails to start diff --git a/tests/scripts/greeter-not-installed.conf b/tests/scripts/greeter-not-installed.conf index a8ad842b..123584c5 100644 --- a/tests/scripts/greeter-not-installed.conf +++ b/tests/scripts/greeter-not-installed.conf @@ -9,9 +9,10 @@ return-value=1 # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Invalid greeter attempted, fails to start diff --git a/tests/scripts/greeter-wrapper.conf b/tests/scripts/greeter-wrapper.conf index ebc4a6f9..c1c2f5bd 100644 --- a/tests/scripts/greeter-wrapper.conf +++ b/tests/scripts/greeter-wrapper.conf @@ -9,9 +9,10 @@ greeter-wrapper=test-greeter-wrapper # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Greeter wrapper starts diff --git a/tests/scripts/greeter-xserver-crash.conf b/tests/scripts/greeter-xserver-crash.conf index 8930e897..4fba2ebf 100644 --- a/tests/scripts/greeter-xserver-crash.conf +++ b/tests/scripts/greeter-xserver-crash.conf @@ -6,9 +6,10 @@ # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Greeter starts @@ -26,9 +27,10 @@ # X server restarts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Greeter starts diff --git a/tests/scripts/group-membership.conf b/tests/scripts/group-membership.conf index 63a82a13..c9d3e8de 100644 --- a/tests/scripts/group-membership.conf +++ b/tests/scripts/group-membership.conf @@ -10,9 +10,10 @@ user-session=default # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Session starts diff --git a/tests/scripts/home-dir-on-authenticate.conf b/tests/scripts/home-dir-on-authenticate.conf index 851ec0c2..159f65be 100644 --- a/tests/scripts/home-dir-on-authenticate.conf +++ b/tests/scripts/home-dir-on-authenticate.conf @@ -10,9 +10,10 @@ user-session=default # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Session starts diff --git a/tests/scripts/home-dir-on-session.conf b/tests/scripts/home-dir-on-session.conf index c65892ef..045d0e07 100644 --- a/tests/scripts/home-dir-on-session.conf +++ b/tests/scripts/home-dir-on-session.conf @@ -10,9 +10,10 @@ user-session=default # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Session starts diff --git a/tests/scripts/keyboard-layout.conf b/tests/scripts/keyboard-layout.conf index 2830b579..7c733e05 100644 --- a/tests/scripts/keyboard-layout.conf +++ b/tests/scripts/keyboard-layout.conf @@ -6,9 +6,10 @@ # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Greeter starts diff --git a/tests/scripts/language-no-accounts-service.conf b/tests/scripts/language-no-accounts-service.conf index 53090872..b6fcd9ed 100644 --- a/tests/scripts/language-no-accounts-service.conf +++ b/tests/scripts/language-no-accounts-service.conf @@ -9,9 +9,10 @@ disable-accounts-service=true # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Greeter starts diff --git a/tests/scripts/language.conf b/tests/scripts/language.conf index bb395695..e07240b6 100644 --- a/tests/scripts/language.conf +++ b/tests/scripts/language.conf @@ -6,9 +6,10 @@ # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Greeter starts diff --git a/tests/scripts/lock-seat-return-session.conf b/tests/scripts/lock-seat-return-session.conf index e32b3597..f22d928c 100644 --- a/tests/scripts/lock-seat-return-session.conf +++ b/tests/scripts/lock-seat-return-session.conf @@ -10,9 +10,10 @@ user-session=default # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Session starts @@ -26,9 +27,10 @@ user-session=default # New X server starts #?XSERVER-1 START VT=8 -#?XSERVER-1 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-1 INDICATE-READY +#?XSERVER-1 INDICATE-READY #?XSERVER-1 ACCEPT-CONNECT # Greeter starts diff --git a/tests/scripts/lock-seat.conf b/tests/scripts/lock-seat.conf index 37a15b52..59ea262b 100644 --- a/tests/scripts/lock-seat.conf +++ b/tests/scripts/lock-seat.conf @@ -10,9 +10,10 @@ user-session=default # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Session starts @@ -26,9 +27,10 @@ user-session=default # New X server starts #?XSERVER-1 START VT=8 -#?XSERVER-1 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-1 INDICATE-READY +#?XSERVER-1 INDICATE-READY #?XSERVER-1 ACCEPT-CONNECT # Greeter starts diff --git a/tests/scripts/lock-session-no-password.conf b/tests/scripts/lock-session-no-password.conf index 84aa7a13..1976cb4f 100644 --- a/tests/scripts/lock-session-no-password.conf +++ b/tests/scripts/lock-session-no-password.conf @@ -10,9 +10,10 @@ user-session=default # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Session starts @@ -26,9 +27,10 @@ user-session=default # New X server starts #?XSERVER-1 START VT=8 -#?XSERVER-1 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-1 INDICATE-READY +#?XSERVER-1 INDICATE-READY #?XSERVER-1 ACCEPT-CONNECT # Greeter starts with session user selected diff --git a/tests/scripts/lock-session-return-session.conf b/tests/scripts/lock-session-return-session.conf index 0b9061f9..b4550329 100644 --- a/tests/scripts/lock-session-return-session.conf +++ b/tests/scripts/lock-session-return-session.conf @@ -10,9 +10,10 @@ user-session=default # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Session starts @@ -26,9 +27,10 @@ user-session=default # New X server starts #?XSERVER-1 START VT=8 -#?XSERVER-1 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-1 INDICATE-READY +#?XSERVER-1 INDICATE-READY #?XSERVER-1 ACCEPT-CONNECT # Greeter starts with session user selected diff --git a/tests/scripts/lock-session.conf b/tests/scripts/lock-session.conf index f2969f35..47557362 100644 --- a/tests/scripts/lock-session.conf +++ b/tests/scripts/lock-session.conf @@ -10,9 +10,10 @@ user-session=default # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Session starts @@ -26,9 +27,10 @@ user-session=default # New X server starts #?XSERVER-1 START VT=8 -#?XSERVER-1 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-1 INDICATE-READY +#?XSERVER-1 INDICATE-READY #?XSERVER-1 ACCEPT-CONNECT # Greeter starts with session user selected diff --git a/tests/scripts/login-crash-authenticate.conf b/tests/scripts/login-crash-authenticate.conf index 7edf3e23..41474102 100644 --- a/tests/scripts/login-crash-authenticate.conf +++ b/tests/scripts/login-crash-authenticate.conf @@ -6,9 +6,10 @@ # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Greeter starts diff --git a/tests/scripts/login-guest-disabled.conf b/tests/scripts/login-guest-disabled.conf index a278be53..02dfeca0 100644 --- a/tests/scripts/login-guest-disabled.conf +++ b/tests/scripts/login-guest-disabled.conf @@ -9,9 +9,10 @@ allow-guest=false # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Greeter starts diff --git a/tests/scripts/login-guest-fail-setup-script.conf b/tests/scripts/login-guest-fail-setup-script.conf index 5738e265..e71347a5 100644 --- a/tests/scripts/login-guest-fail-setup-script.conf +++ b/tests/scripts/login-guest-fail-setup-script.conf @@ -9,9 +9,10 @@ guest-account-script=false # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Greeter starts @@ -34,9 +35,10 @@ guest-account-script=false # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Greeter starts diff --git a/tests/scripts/login-guest-logout.conf b/tests/scripts/login-guest-logout.conf index c69c7b9b..0c5e7a4f 100644 --- a/tests/scripts/login-guest-logout.conf +++ b/tests/scripts/login-guest-logout.conf @@ -12,9 +12,10 @@ user-session=default # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Greeter starts @@ -49,9 +50,10 @@ user-session=default # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Greeter starts diff --git a/tests/scripts/login-guest-no-setup-script.conf b/tests/scripts/login-guest-no-setup-script.conf index 86324588..e6aecf91 100644 --- a/tests/scripts/login-guest-no-setup-script.conf +++ b/tests/scripts/login-guest-no-setup-script.conf @@ -9,9 +9,10 @@ guest-account-script= # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Greeter starts diff --git a/tests/scripts/login-guest.conf b/tests/scripts/login-guest.conf index 804c3272..ad536a59 100644 --- a/tests/scripts/login-guest.conf +++ b/tests/scripts/login-guest.conf @@ -12,9 +12,10 @@ user-session=default # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Greeter starts diff --git a/tests/scripts/login-info-prompt.conf b/tests/scripts/login-info-prompt.conf index 1a12c036..1a0e3c6d 100644 --- a/tests/scripts/login-info-prompt.conf +++ b/tests/scripts/login-info-prompt.conf @@ -6,9 +6,10 @@ # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Greeter starts diff --git a/tests/scripts/login-invalid-session.conf b/tests/scripts/login-invalid-session.conf index f08eb2e4..bf53ed30 100644 --- a/tests/scripts/login-invalid-session.conf +++ b/tests/scripts/login-invalid-session.conf @@ -6,9 +6,10 @@ # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Greeter starts @@ -31,9 +32,10 @@ # X server restarts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Greeter starts diff --git a/tests/scripts/login-invalid-user.conf b/tests/scripts/login-invalid-user.conf index 231b9fd7..5500b027 100644 --- a/tests/scripts/login-invalid-user.conf +++ b/tests/scripts/login-invalid-user.conf @@ -6,9 +6,10 @@ # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Greeter starts diff --git a/tests/scripts/login-logout.conf b/tests/scripts/login-logout.conf index 31210264..1f8e245e 100644 --- a/tests/scripts/login-logout.conf +++ b/tests/scripts/login-logout.conf @@ -9,9 +9,10 @@ user-session=default # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Greeter starts @@ -42,9 +43,10 @@ user-session=default # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Greeter starts diff --git a/tests/scripts/login-long-password.conf b/tests/scripts/login-long-password.conf index 9a6d6f6a..1a07f21c 100644 --- a/tests/scripts/login-long-password.conf +++ b/tests/scripts/login-long-password.conf @@ -6,9 +6,10 @@ # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Greeter starts diff --git a/tests/scripts/login-long-username.conf b/tests/scripts/login-long-username.conf index 9da48179..1e291b25 100644 --- a/tests/scripts/login-long-username.conf +++ b/tests/scripts/login-long-username.conf @@ -6,9 +6,10 @@ # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Greeter starts diff --git a/tests/scripts/login-manual-previous-session.conf b/tests/scripts/login-manual-previous-session.conf index 929ec67f..bf0f6a1b 100644 --- a/tests/scripts/login-manual-previous-session.conf +++ b/tests/scripts/login-manual-previous-session.conf @@ -6,9 +6,10 @@ # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Greeter starts diff --git a/tests/scripts/login-manual.conf b/tests/scripts/login-manual.conf index 22a0a4fc..4961848a 100644 --- a/tests/scripts/login-manual.conf +++ b/tests/scripts/login-manual.conf @@ -9,9 +9,10 @@ user-session=default # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Greeter starts diff --git a/tests/scripts/login-multi-info-prompt.conf b/tests/scripts/login-multi-info-prompt.conf index f823b6a9..a570c609 100644 --- a/tests/scripts/login-multi-info-prompt.conf +++ b/tests/scripts/login-multi-info-prompt.conf @@ -6,9 +6,10 @@ # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Greeter starts diff --git a/tests/scripts/login-multi-prompt.conf b/tests/scripts/login-multi-prompt.conf index 321bbbee..7987b30e 100644 --- a/tests/scripts/login-multi-prompt.conf +++ b/tests/scripts/login-multi-prompt.conf @@ -6,9 +6,10 @@ # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Greeter starts diff --git a/tests/scripts/login-new-authtok.conf b/tests/scripts/login-new-authtok.conf index c1234d45..2058e67c 100644 --- a/tests/scripts/login-new-authtok.conf +++ b/tests/scripts/login-new-authtok.conf @@ -9,9 +9,10 @@ user-session=default # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Greeter starts diff --git a/tests/scripts/login-no-password.conf b/tests/scripts/login-no-password.conf index a309f2ae..04b22509 100644 --- a/tests/scripts/login-no-password.conf +++ b/tests/scripts/login-no-password.conf @@ -9,9 +9,10 @@ user-session=default # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Greeter starts diff --git a/tests/scripts/login-pam.conf b/tests/scripts/login-pam.conf index 2ba4eab9..3828a62d 100644 --- a/tests/scripts/login-pam.conf +++ b/tests/scripts/login-pam.conf @@ -9,9 +9,10 @@ user-session=default # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Greeter starts diff --git a/tests/scripts/login-pick-session.conf b/tests/scripts/login-pick-session.conf index 62ea982d..a624eb0d 100644 --- a/tests/scripts/login-pick-session.conf +++ b/tests/scripts/login-pick-session.conf @@ -6,9 +6,10 @@ # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Greeter starts diff --git a/tests/scripts/login-previous-session.conf b/tests/scripts/login-previous-session.conf index fc46bd31..b6726cda 100644 --- a/tests/scripts/login-previous-session.conf +++ b/tests/scripts/login-previous-session.conf @@ -6,9 +6,10 @@ # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Greeter starts diff --git a/tests/scripts/login-remember-session.conf b/tests/scripts/login-remember-session.conf index 5897c6ee..0523b7f9 100644 --- a/tests/scripts/login-remember-session.conf +++ b/tests/scripts/login-remember-session.conf @@ -6,9 +6,10 @@ # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Greeter starts @@ -37,9 +38,10 @@ # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Greeter starts diff --git a/tests/scripts/login-remote-session.conf b/tests/scripts/login-remote-session.conf index 12dd9ddb..1cbdad9c 100644 --- a/tests/scripts/login-remote-session.conf +++ b/tests/scripts/login-remote-session.conf @@ -6,9 +6,10 @@ # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Greeter starts diff --git a/tests/scripts/login-session-crash.conf b/tests/scripts/login-session-crash.conf index 867dc25d..2db6ff82 100644 --- a/tests/scripts/login-session-crash.conf +++ b/tests/scripts/login-session-crash.conf @@ -9,9 +9,10 @@ user-session=default # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Greeter starts @@ -42,9 +43,10 @@ user-session=default # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Greeter starts diff --git a/tests/scripts/login-two-factor.conf b/tests/scripts/login-two-factor.conf index 2aae4da6..96159cac 100644 --- a/tests/scripts/login-two-factor.conf +++ b/tests/scripts/login-two-factor.conf @@ -6,9 +6,10 @@ # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Greeter starts diff --git a/tests/scripts/login-wrong-password.conf b/tests/scripts/login-wrong-password.conf index 6cdd19ee..e2d193c9 100644 --- a/tests/scripts/login-wrong-password.conf +++ b/tests/scripts/login-wrong-password.conf @@ -6,9 +6,10 @@ # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Greeter starts diff --git a/tests/scripts/login-xserver-crash.conf b/tests/scripts/login-xserver-crash.conf index 01d779b1..4c12aa9e 100644 --- a/tests/scripts/login-xserver-crash.conf +++ b/tests/scripts/login-xserver-crash.conf @@ -9,9 +9,10 @@ user-session=default # XServer starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Greeter starts @@ -42,6 +43,7 @@ user-session=default # X server restarts #?XSERVER-0 START VT=7 +#?*XSERVER-0 INDICATE-READY #?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT diff --git a/tests/scripts/login.conf b/tests/scripts/login.conf index 5a09050e..515d3356 100644 --- a/tests/scripts/login.conf +++ b/tests/scripts/login.conf @@ -9,9 +9,10 @@ user-session=default # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Greeter starts diff --git a/tests/scripts/login1.conf b/tests/scripts/login1.conf index f00950dc..c09ef2a2 100644 --- a/tests/scripts/login1.conf +++ b/tests/scripts/login1.conf @@ -10,9 +10,10 @@ user-session=default # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Session starts diff --git a/tests/scripts/no-accounts-service.conf b/tests/scripts/no-accounts-service.conf index b519fdc1..3ee13c4a 100644 --- a/tests/scripts/no-accounts-service.conf +++ b/tests/scripts/no-accounts-service.conf @@ -13,9 +13,10 @@ user-session=default # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Session starts diff --git a/tests/scripts/no-config.conf b/tests/scripts/no-config.conf index 6419a7d8..89d7ba50 100644 --- a/tests/scripts/no-config.conf +++ b/tests/scripts/no-config.conf @@ -9,9 +9,10 @@ have-config=false # One X server should start by default #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Greeter starts diff --git a/tests/scripts/no-console-kit-or-login1.conf b/tests/scripts/no-console-kit-or-login1.conf index cd938768..3b2ef65e 100644 --- a/tests/scripts/no-console-kit-or-login1.conf +++ b/tests/scripts/no-console-kit-or-login1.conf @@ -14,9 +14,10 @@ user-session=default # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Session starts diff --git a/tests/scripts/no-console-kit.conf b/tests/scripts/no-console-kit.conf index de916d1c..3a8d9032 100644 --- a/tests/scripts/no-console-kit.conf +++ b/tests/scripts/no-console-kit.conf @@ -13,9 +13,10 @@ user-session=default # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Session starts diff --git a/tests/scripts/no-keyboard-layout.conf b/tests/scripts/no-keyboard-layout.conf index eeb0f5ca..58088514 100644 --- a/tests/scripts/no-keyboard-layout.conf +++ b/tests/scripts/no-keyboard-layout.conf @@ -6,9 +6,10 @@ # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Greeter starts diff --git a/tests/scripts/no-language.conf b/tests/scripts/no-language.conf index c619978e..21d5459a 100644 --- a/tests/scripts/no-language.conf +++ b/tests/scripts/no-language.conf @@ -6,9 +6,10 @@ # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Greeter starts diff --git a/tests/scripts/no-login1.conf b/tests/scripts/no-login1.conf index 3780bee4..bccc6b62 100644 --- a/tests/scripts/no-login1.conf +++ b/tests/scripts/no-login1.conf @@ -13,9 +13,10 @@ user-session=default # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Session starts diff --git a/tests/scripts/open-file-descriptors.conf b/tests/scripts/open-file-descriptors.conf index 62613088..a0d9dd9a 100644 --- a/tests/scripts/open-file-descriptors.conf +++ b/tests/scripts/open-file-descriptors.conf @@ -10,9 +10,10 @@ user-session=default # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Greeter starts diff --git a/tests/scripts/pam.conf b/tests/scripts/pam.conf index 04177326..c9456c37 100644 --- a/tests/scripts/pam.conf +++ b/tests/scripts/pam.conf @@ -10,9 +10,10 @@ user-session=default # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Session starts diff --git a/tests/scripts/plymouth-active-vt.conf b/tests/scripts/plymouth-active-vt.conf index 43daef1f..2e2ca1a1 100644 --- a/tests/scripts/plymouth-active-vt.conf +++ b/tests/scripts/plymouth-active-vt.conf @@ -16,14 +16,15 @@ active=true # X server starts #?XSERVER-0 START VT=7 + +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY #?XSERVER-0 INDICATE-READY +#?XSERVER-0 ACCEPT-CONNECT # Plymouth quits but keeps image in framebuffer #?PLYMOUTH QUIT RETAIN-SPLASH=TRUE -# LightDM connects to X server -#?XSERVER-0 ACCEPT-CONNECT - # Greeter starts #?GREETER-X-0 START #?XSERVER-0 ACCEPT-CONNECT diff --git a/tests/scripts/plymouth-inactive-vt.conf b/tests/scripts/plymouth-inactive-vt.conf index d1fd2a6d..ec96e7dd 100644 --- a/tests/scripts/plymouth-inactive-vt.conf +++ b/tests/scripts/plymouth-inactive-vt.conf @@ -13,9 +13,10 @@ active=true #?PLYMOUTH HAS-ACTIVE-VT=FALSE #?PLYMOUTH QUIT RETAIN-SPLASH=FALSE #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Greeter starts diff --git a/tests/scripts/power-no-console-kit.conf b/tests/scripts/power-no-console-kit.conf index 77e06412..936dbf67 100644 --- a/tests/scripts/power-no-console-kit.conf +++ b/tests/scripts/power-no-console-kit.conf @@ -9,9 +9,10 @@ disable-console-kit=true # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Greeter starts diff --git a/tests/scripts/power-no-login1.conf b/tests/scripts/power-no-login1.conf index f5044b18..62441878 100644 --- a/tests/scripts/power-no-login1.conf +++ b/tests/scripts/power-no-login1.conf @@ -9,9 +9,10 @@ disable-login1=true # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Greeter starts diff --git a/tests/scripts/power-no-services.conf b/tests/scripts/power-no-services.conf index 603ced42..c631d88b 100644 --- a/tests/scripts/power-no-services.conf +++ b/tests/scripts/power-no-services.conf @@ -11,9 +11,10 @@ disable-login1=true # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Greeter starts diff --git a/tests/scripts/power.conf b/tests/scripts/power.conf index d2ea20bb..28e6f8d7 100644 --- a/tests/scripts/power.conf +++ b/tests/scripts/power.conf @@ -6,9 +6,10 @@ # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Greeter starts diff --git a/tests/scripts/restart-authentication.conf b/tests/scripts/restart-authentication.conf index 88755780..8799c649 100644 --- a/tests/scripts/restart-authentication.conf +++ b/tests/scripts/restart-authentication.conf @@ -6,9 +6,10 @@ # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Greeter starts diff --git a/tests/scripts/script-hook-fail-display-setup.conf b/tests/scripts/script-hook-fail-display-setup.conf index e9e39124..80c782d3 100644 --- a/tests/scripts/script-hook-fail-display-setup.conf +++ b/tests/scripts/script-hook-fail-display-setup.conf @@ -9,9 +9,10 @@ display-setup-script=test-script-hook DISPLAY-SETUP 1 # One X server should start by default #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Setup script fails diff --git a/tests/scripts/script-hook-fail-greeter-setup.conf b/tests/scripts/script-hook-fail-greeter-setup.conf index 701a41a4..683b30a4 100644 --- a/tests/scripts/script-hook-fail-greeter-setup.conf +++ b/tests/scripts/script-hook-fail-greeter-setup.conf @@ -9,9 +9,10 @@ greeter-setup-script=test-script-hook GREETER-SETUP 1 # One X server should start by default #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Setup script fails diff --git a/tests/scripts/script-hook-fail-session-setup.conf b/tests/scripts/script-hook-fail-session-setup.conf index 7c7f6ea6..f07a5c95 100644 --- a/tests/scripts/script-hook-fail-session-setup.conf +++ b/tests/scripts/script-hook-fail-session-setup.conf @@ -10,9 +10,10 @@ autologin-user=have-password1 # One X server should start by default #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Setup script fails diff --git a/tests/scripts/script-hooks.conf b/tests/scripts/script-hooks.conf index a6e670ba..bd33d7e2 100644 --- a/tests/scripts/script-hooks.conf +++ b/tests/scripts/script-hooks.conf @@ -14,9 +14,10 @@ user-session=default # One X server should start by default #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Script hooks run @@ -39,9 +40,10 @@ user-session=default # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Script hooks run diff --git a/tests/scripts/session-env.conf b/tests/scripts/session-env.conf index 8a96b802..0ce0a4cc 100644 --- a/tests/scripts/session-env.conf +++ b/tests/scripts/session-env.conf @@ -10,9 +10,10 @@ user-session=default # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Session starts diff --git a/tests/scripts/session-stderr-backup.conf b/tests/scripts/session-stderr-backup.conf index 7f7a12a2..7273492f 100644 --- a/tests/scripts/session-stderr-backup.conf +++ b/tests/scripts/session-stderr-backup.conf @@ -10,9 +10,10 @@ user-session=default # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Session starts @@ -29,6 +30,7 @@ user-session=default #?*SESSION-X-0 LOGOUT #?XSERVER-0 TERMINATE SIGNAL=15 #?XSERVER-0 START VT=7 +#?*XSERVER-0 INDICATE-READY #?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 START @@ -57,6 +59,7 @@ user-session=default #?*SESSION-X-0 LOGOUT #?XSERVER-0 TERMINATE SIGNAL=15 #?XSERVER-0 START VT=7 +#?*XSERVER-0 INDICATE-READY #?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 START diff --git a/tests/scripts/session-stderr-multi-write.conf b/tests/scripts/session-stderr-multi-write.conf index f107c624..996ccba9 100644 --- a/tests/scripts/session-stderr-multi-write.conf +++ b/tests/scripts/session-stderr-multi-write.conf @@ -10,9 +10,10 @@ user-session=default # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Session starts diff --git a/tests/scripts/session-stderr.conf b/tests/scripts/session-stderr.conf index 57008242..7d1fb6e8 100644 --- a/tests/scripts/session-stderr.conf +++ b/tests/scripts/session-stderr.conf @@ -10,9 +10,10 @@ user-session=default # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Session starts diff --git a/tests/scripts/session-stdout.conf b/tests/scripts/session-stdout.conf index 37074b67..ab0536aa 100644 --- a/tests/scripts/session-stdout.conf +++ b/tests/scripts/session-stdout.conf @@ -10,9 +10,10 @@ user-session=default # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Session starts diff --git a/tests/scripts/switch-to-greeter-new-session-logout-new.conf b/tests/scripts/switch-to-greeter-new-session-logout-new.conf index 32eb1125..a831abc5 100644 --- a/tests/scripts/switch-to-greeter-new-session-logout-new.conf +++ b/tests/scripts/switch-to-greeter-new-session-logout-new.conf @@ -10,6 +10,9 @@ user-session=default # X server starts #?XSERVER-0 START VT=7 + +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY #?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT @@ -24,9 +27,10 @@ user-session=default # New X server starts #?XSERVER-1 START VT=8 -#?XSERVER-1 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-1 INDICATE-READY +#?XSERVER-1 INDICATE-READY #?XSERVER-1 ACCEPT-CONNECT # Greeter starts @@ -55,6 +59,7 @@ user-session=default # X server starts #?XSERVER-1 START VT=8 +#?*XSERVER-1 INDICATE-READY #?XSERVER-1 INDICATE-READY #?XSERVER-1 ACCEPT-CONNECT diff --git a/tests/scripts/switch-to-greeter-new-session-logout-old.conf b/tests/scripts/switch-to-greeter-new-session-logout-old.conf index b9059fc7..ae515fd8 100644 --- a/tests/scripts/switch-to-greeter-new-session-logout-old.conf +++ b/tests/scripts/switch-to-greeter-new-session-logout-old.conf @@ -10,6 +10,9 @@ user-session=default # X server starts #?XSERVER-0 START VT=7 + +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY #?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT @@ -24,9 +27,10 @@ user-session=default # New X server starts #?XSERVER-1 START VT=8 -#?XSERVER-1 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-1 INDICATE-READY +#?XSERVER-1 INDICATE-READY #?XSERVER-1 ACCEPT-CONNECT # Greeter starts @@ -59,6 +63,7 @@ user-session=default # X server starts #?XSERVER-0 START VT=7 +#?*XSERVER-0 INDICATE-READY #?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT diff --git a/tests/scripts/switch-to-greeter-new-session.conf b/tests/scripts/switch-to-greeter-new-session.conf index 6f0f5e79..5640565c 100644 --- a/tests/scripts/switch-to-greeter-new-session.conf +++ b/tests/scripts/switch-to-greeter-new-session.conf @@ -10,9 +10,10 @@ user-session=default # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Session starts @@ -26,9 +27,10 @@ user-session=default # New X server starts #?XSERVER-1 START VT=8 -#?XSERVER-1 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-1 INDICATE-READY +#?XSERVER-1 INDICATE-READY #?XSERVER-1 ACCEPT-CONNECT # Greeter starts diff --git a/tests/scripts/switch-to-greeter-return-session-logout.conf b/tests/scripts/switch-to-greeter-return-session-logout.conf index 91332062..f8b4c54d 100644 --- a/tests/scripts/switch-to-greeter-return-session-logout.conf +++ b/tests/scripts/switch-to-greeter-return-session-logout.conf @@ -10,9 +10,10 @@ user-session=default # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Session starts @@ -26,9 +27,10 @@ user-session=default # New X server starts #?XSERVER-1 START VT=8 -#?XSERVER-1 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-1 INDICATE-READY +#?XSERVER-1 INDICATE-READY #?XSERVER-1 ACCEPT-CONNECT # Greeter starts @@ -55,6 +57,7 @@ user-session=default # X server starts #?XSERVER-0 START VT=7 +#?*XSERVER-0 INDICATE-READY #?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT diff --git a/tests/scripts/switch-to-greeter-return-session.conf b/tests/scripts/switch-to-greeter-return-session.conf index be80d0d2..21af22f9 100644 --- a/tests/scripts/switch-to-greeter-return-session.conf +++ b/tests/scripts/switch-to-greeter-return-session.conf @@ -10,9 +10,10 @@ user-session=default # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Session starts @@ -26,9 +27,10 @@ user-session=default # New X server starts #?XSERVER-1 START VT=8 -#?XSERVER-1 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-1 INDICATE-READY +#?XSERVER-1 INDICATE-READY #?XSERVER-1 ACCEPT-CONNECT # Greeter starts diff --git a/tests/scripts/switch-to-greeter.conf b/tests/scripts/switch-to-greeter.conf index 2c19fe3f..9cd4dd77 100644 --- a/tests/scripts/switch-to-greeter.conf +++ b/tests/scripts/switch-to-greeter.conf @@ -10,9 +10,10 @@ user-session=default # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Session starts @@ -26,9 +27,10 @@ user-session=default # New X server starts #?XSERVER-1 START VT=8 -#?XSERVER-1 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-1 INDICATE-READY +#?XSERVER-1 INDICATE-READY #?XSERVER-1 ACCEPT-CONNECT # Greeter starts diff --git a/tests/scripts/switch-to-guest.conf b/tests/scripts/switch-to-guest.conf index b2ae94c2..b8af1db0 100644 --- a/tests/scripts/switch-to-guest.conf +++ b/tests/scripts/switch-to-guest.conf @@ -14,9 +14,10 @@ user-session=default # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Default session starts @@ -30,9 +31,10 @@ user-session=default # New X server starts #?XSERVER-1 START VT=8 -#?XSERVER-1 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-1 INDICATE-READY +#?XSERVER-1 INDICATE-READY #?XSERVER-1 ACCEPT-CONNECT # Guest account created diff --git a/tests/scripts/switch-to-user-existing-session.conf b/tests/scripts/switch-to-user-existing-session.conf index 4ad54882..f56db6ca 100644 --- a/tests/scripts/switch-to-user-existing-session.conf +++ b/tests/scripts/switch-to-user-existing-session.conf @@ -11,9 +11,10 @@ user-session=default # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Session starts diff --git a/tests/scripts/switch-to-user-logout.conf b/tests/scripts/switch-to-user-logout.conf index fdf3976f..0025017d 100644 --- a/tests/scripts/switch-to-user-logout.conf +++ b/tests/scripts/switch-to-user-logout.conf @@ -11,9 +11,10 @@ user-session=default # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Session starts @@ -27,9 +28,10 @@ user-session=default # New X server starts #?XSERVER-1 START VT=8 -#?XSERVER-1 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-1 INDICATE-READY +#?XSERVER-1 INDICATE-READY #?XSERVER-1 ACCEPT-CONNECT # New session starts @@ -45,9 +47,10 @@ user-session=default # X server starts for greeter #?XSERVER-1 START VT=8 -#?XSERVER-1 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-1 INDICATE-READY +#?XSERVER-1 INDICATE-READY #?XSERVER-1 ACCEPT-CONNECT # Greeter starts diff --git a/tests/scripts/switch-to-user-no-password.conf b/tests/scripts/switch-to-user-no-password.conf index d1cde5b8..e80b95c4 100644 --- a/tests/scripts/switch-to-user-no-password.conf +++ b/tests/scripts/switch-to-user-no-password.conf @@ -11,9 +11,10 @@ user-session=default # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Session starts @@ -27,9 +28,10 @@ user-session=default # New X server starts #?XSERVER-1 START VT=8 -#?XSERVER-1 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-1 INDICATE-READY +#?XSERVER-1 INDICATE-READY #?XSERVER-1 ACCEPT-CONNECT # New session starts diff --git a/tests/scripts/switch-to-user.conf b/tests/scripts/switch-to-user.conf index f29a43a1..a83c78cd 100644 --- a/tests/scripts/switch-to-user.conf +++ b/tests/scripts/switch-to-user.conf @@ -11,9 +11,10 @@ user-session=default # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Session starts @@ -27,9 +28,10 @@ user-session=default # New X server starts #?XSERVER-1 START VT=8 -#?XSERVER-1 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-1 INDICATE-READY +#?XSERVER-1 INDICATE-READY #?XSERVER-1 ACCEPT-CONNECT # Greeter starts diff --git a/tests/scripts/switch-to-users.conf b/tests/scripts/switch-to-users.conf index 6a42bc34..c17933be 100644 --- a/tests/scripts/switch-to-users.conf +++ b/tests/scripts/switch-to-users.conf @@ -11,9 +11,10 @@ user-session=default # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Session starts @@ -27,9 +28,10 @@ user-session=default # New X server starts #?XSERVER-1 START VT=8 -#?XSERVER-1 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-1 INDICATE-READY +#?XSERVER-1 INDICATE-READY #?XSERVER-1 ACCEPT-CONNECT # New session starts @@ -43,9 +45,10 @@ user-session=default # New X server starts #?XSERVER-2 START VT=9 -#?XSERVER-2 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-2 INDICATE-READY +#?XSERVER-2 INDICATE-READY #?XSERVER-2 ACCEPT-CONNECT # New session starts diff --git a/tests/scripts/system-xauthority.conf b/tests/scripts/system-xauthority.conf index 0aa5a672..91125a7b 100644 --- a/tests/scripts/system-xauthority.conf +++ b/tests/scripts/system-xauthority.conf @@ -13,9 +13,10 @@ user-session=default # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Session starts diff --git a/tests/scripts/unity-autologin.conf b/tests/scripts/unity-autologin.conf index 39c19b33..1d3d148b 100644 --- a/tests/scripts/unity-autologin.conf +++ b/tests/scripts/unity-autologin.conf @@ -15,9 +15,10 @@ user-session=default # X server starts #?XSERVER-0 START MIR-ID=0 + +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY #?XSERVER-0 INDICATE-READY - -# LightDM connects to X server #?XSERVER-0 ACCEPT-CONNECT # Session starts diff --git a/tests/scripts/unity-compositor-command.conf b/tests/scripts/unity-compositor-command.conf index 716461b6..2d16d570 100644 --- a/tests/scripts/unity-compositor-command.conf +++ b/tests/scripts/unity-compositor-command.conf @@ -15,9 +15,10 @@ unity-compositor-command=unity-system-compositor --test # X server starts #?XSERVER-0 START MIR-ID=0 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Greeter starts diff --git a/tests/scripts/unity-compositor-fail-ready.conf b/tests/scripts/unity-compositor-fail-ready.conf index 5c12fc8a..271049e0 100644 --- a/tests/scripts/unity-compositor-fail-ready.conf +++ b/tests/scripts/unity-compositor-fail-ready.conf @@ -16,9 +16,10 @@ unity-compositor-timeout=1 # X server starts in VT mode #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Greeter starts diff --git a/tests/scripts/unity-compositor-fail-start.conf b/tests/scripts/unity-compositor-fail-start.conf index a9e95545..bade9353 100644 --- a/tests/scripts/unity-compositor-fail-start.conf +++ b/tests/scripts/unity-compositor-fail-start.conf @@ -16,9 +16,10 @@ type=unity # X server starts in VT mode #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Greeter starts diff --git a/tests/scripts/unity-login.conf b/tests/scripts/unity-login.conf index e9af08af..4c7e39c4 100644 --- a/tests/scripts/unity-login.conf +++ b/tests/scripts/unity-login.conf @@ -14,9 +14,10 @@ user-session=default # X server starts #?XSERVER-0 START MIR-ID=0 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Greeter starts diff --git a/tests/scripts/unity-plymouth.conf b/tests/scripts/unity-plymouth.conf index 879785ea..39a85a94 100644 --- a/tests/scripts/unity-plymouth.conf +++ b/tests/scripts/unity-plymouth.conf @@ -28,9 +28,10 @@ active=true # X server starts #?XSERVER-0 START MIR-ID=0 + +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY #?XSERVER-0 INDICATE-READY - -# LightDM connects to X server #?XSERVER-0 ACCEPT-CONNECT # Session starts diff --git a/tests/scripts/unity-switch.conf b/tests/scripts/unity-switch.conf index c4b0e5f8..57549cf5 100644 --- a/tests/scripts/unity-switch.conf +++ b/tests/scripts/unity-switch.conf @@ -15,9 +15,10 @@ user-session=default # X server starts #?XSERVER-0 START MIR-ID=0 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Session starts @@ -34,9 +35,10 @@ user-session=default # New X server starts #?XSERVER-1 START MIR-ID=1 -#?XSERVER-1 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-1 INDICATE-READY +#?XSERVER-1 INDICATE-READY #?XSERVER-1 ACCEPT-CONNECT # Greeter starts @@ -68,6 +70,7 @@ user-session=default # X server starts #?XSERVER-1 START MIR-ID=2 +#?*XSERVER-1 INDICATE-READY #?XSERVER-1 INDICATE-READY #?XSERVER-1 ACCEPT-CONNECT diff --git a/tests/scripts/user-renamed-invalid.conf b/tests/scripts/user-renamed-invalid.conf index ff9d0d61..481df50e 100644 --- a/tests/scripts/user-renamed-invalid.conf +++ b/tests/scripts/user-renamed-invalid.conf @@ -9,9 +9,10 @@ autologin-user=change-user-invalid # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # (fails to start session for invalid user) diff --git a/tests/scripts/user-renamed.conf b/tests/scripts/user-renamed.conf index 3bddb79b..db791500 100644 --- a/tests/scripts/user-renamed.conf +++ b/tests/scripts/user-renamed.conf @@ -10,9 +10,10 @@ user-session=default # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Session starts diff --git a/tests/scripts/users.conf b/tests/scripts/users.conf index db3ddee7..d50f1dc3 100644 --- a/tests/scripts/users.conf +++ b/tests/scripts/users.conf @@ -12,9 +12,10 @@ log-user-changes=true # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Greeter starts diff --git a/tests/scripts/util-path.conf b/tests/scripts/util-path.conf index 53fa4d11..ac923a8b 100644 --- a/tests/scripts/util-path.conf +++ b/tests/scripts/util-path.conf @@ -10,9 +10,10 @@ user-session=default # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Session starts diff --git a/tests/scripts/vnc-command.conf b/tests/scripts/vnc-command.conf index 678cd652..3c4ad392 100644 --- a/tests/scripts/vnc-command.conf +++ b/tests/scripts/vnc-command.conf @@ -21,11 +21,15 @@ command=Xvnc -option # Xvnc server starts #?XSERVER-0 START GEOMETRY=1024x768 DEPTH=8 OPTION=TRUE +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY +#?XSERVER-0 ACCEPT-CONNECT + # Negotiate with Xvnc +#?*XSERVER-0 START-VNC #?VNC-CLIENT CONNECTED VERSION="RFB 003.007" -#?XSERVER-0 INDICATE-READY #?XSERVER-0 VNC-CLIENT-CONNECT VERSION="RFB 003.003" -#?XSERVER-0 ACCEPT-CONNECT # Greeter starts and connects to remote X server #?GREETER-X-0 START diff --git a/tests/scripts/vnc-dimensions.conf b/tests/scripts/vnc-dimensions.conf index 16ecab85..4fdfeed8 100644 --- a/tests/scripts/vnc-dimensions.conf +++ b/tests/scripts/vnc-dimensions.conf @@ -23,11 +23,15 @@ depth=16 # Xvnc server starts #?XSERVER-0 START GEOMETRY=1440x900 DEPTH=16 OPTION=FALSE +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY +#?XSERVER-0 ACCEPT-CONNECT + # Negotiate with Xvnc +#?*XSERVER-0 START-VNC #?VNC-CLIENT CONNECTED VERSION="RFB 003.007" -#?XSERVER-0 INDICATE-READY #?XSERVER-0 VNC-CLIENT-CONNECT VERSION="RFB 003.003" -#?XSERVER-0 ACCEPT-CONNECT # Greeter starts and connects to remote X server #?GREETER-X-0 START diff --git a/tests/scripts/vnc-login.conf b/tests/scripts/vnc-login.conf index b47e052c..f16c9d83 100644 --- a/tests/scripts/vnc-login.conf +++ b/tests/scripts/vnc-login.conf @@ -23,14 +23,17 @@ user-session=default # Xvnc server starts #?XSERVER-0 START GEOMETRY=1024x768 DEPTH=8 OPTION=FALSE +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY +#?XSERVER-0 ACCEPT-CONNECT + # Negotiate with Xvnc +#?*XSERVER-0 START-VNC #?VNC-CLIENT CONNECTED VERSION="RFB 003.007" -#?XSERVER-0 INDICATE-READY - -# LightDM and vnc-client connect to X server +# VNC client connects to X server #?XSERVER-0 VNC-CLIENT-CONNECT VERSION="RFB 003.003" -#?XSERVER-0 ACCEPT-CONNECT # Greeter starts and connects to remote X server #?GREETER-X-0 START diff --git a/tests/scripts/vnc-open-file-descriptors.conf b/tests/scripts/vnc-open-file-descriptors.conf index 57d74832..97bfa1b7 100644 --- a/tests/scripts/vnc-open-file-descriptors.conf +++ b/tests/scripts/vnc-open-file-descriptors.conf @@ -23,16 +23,17 @@ user-session=default # Xvnc server starts #?XSERVER-0 START GEOMETRY=1024x768 DEPTH=8 OPTION=FALSE +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY +#?XSERVER-0 ACCEPT-CONNECT + # Negotiate with Xvnc +#?*XSERVER-0 START-VNC #?VNC-CLIENT CONNECTED VERSION="RFB 003.007" -#?XSERVER-0 INDICATE-READY - #?XSERVER-0 VNC-CLIENT-CONNECT VERSION="RFB 003.003" -# LightDM connects to X server -#?XSERVER-0 ACCEPT-CONNECT - # Greeter starts and connects to remote X server #?GREETER-X-0 START #?XSERVER-0 ACCEPT-CONNECT diff --git a/tests/scripts/xauthority.conf b/tests/scripts/xauthority.conf index aa895a55..5868409d 100644 --- a/tests/scripts/xauthority.conf +++ b/tests/scripts/xauthority.conf @@ -10,9 +10,10 @@ user-session=default # X server starts #?XSERVER-0 START VT=7 -#?XSERVER-0 INDICATE-READY -# LightDM connects to X server +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT # Session starts diff --git a/tests/scripts/xserver-no-share.conf b/tests/scripts/xserver-no-share.conf index c62fdf26..214be0e8 100644 --- a/tests/scripts/xserver-no-share.conf +++ b/tests/scripts/xserver-no-share.conf @@ -10,6 +10,9 @@ xserver-share=false # X server starts #?XSERVER-0 START VT=7 + +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY #?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT @@ -29,6 +32,9 @@ xserver-share=false # New X server starts for session #?XSERVER-1 START VT=8 + +# Daemon connects when X server is ready +#?*XSERVER-1 INDICATE-READY #?XSERVER-1 INDICATE-READY #?XSERVER-1 ACCEPT-CONNECT diff --git a/tests/src/X.c b/tests/src/X.c index 66574238..34d373c4 100644 --- a/tests/src/X.c +++ b/tests/src/X.c @@ -59,25 +59,11 @@ quit (int status) } static void -indicate_ready (void) -{ - void *handler; - handler = signal (SIGUSR1, SIG_IGN); - if (handler == SIG_IGN) - { - status_notify ("XSERVER-%d INDICATE-READY", display_number); - kill (getppid (), SIGUSR1); - } - signal (SIGUSR1, handler); -} - -static void signal_cb (int signum) { if (signum == SIGHUP) { status_notify ("XSERVER-%d DISCONNECT-CLIENTS", display_number); - indicate_ready (); } else { @@ -166,8 +152,6 @@ static void client_disconnected_cb (XServer *server, XClient *client) { g_signal_handlers_disconnect_matched (client, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, NULL); - if (x_server_get_n_clients (server) == 0) - indicate_ready (); } static void @@ -188,6 +172,20 @@ request_cb (const gchar *request) kill (getpid (), SIGSEGV); } g_free (r); + r = g_strdup_printf ("XSERVER-%d INDICATE-READY", display_number); + if (strcmp (request, r) == 0) + { + void *handler; + + handler = signal (SIGUSR1, SIG_IGN); + if (handler == SIG_IGN) + { + status_notify ("XSERVER-%d INDICATE-READY", display_number); + kill (getppid (), SIGUSR1); + } + signal (SIGUSR1, handler); + } + g_free (r); } int @@ -402,9 +400,6 @@ main (int argc, char **argv) quit (EXIT_FAILURE); } - /* Indicate ready if parent process has requested it */ - indicate_ready (); - g_main_loop_run (loop); cleanup (); diff --git a/tests/src/Xvnc.c b/tests/src/Xvnc.c index fd374191..4c1a60a9 100644 --- a/tests/src/Xvnc.c +++ b/tests/src/Xvnc.c @@ -29,19 +29,6 @@ static int display_number = 0; static XServer *xserver = NULL; static void -indicate_ready (void) -{ - void *handler; - handler = signal (SIGUSR1, SIG_IGN); - if (handler == SIG_IGN) - { - status_notify ("XSERVER-%d INDICATE-READY", display_number); - kill (getppid (), SIGUSR1); - } - signal (SIGUSR1, handler); -} - -static void cleanup (void) { if (lock_path) @@ -63,7 +50,6 @@ signal_cb (int signum) if (signum == SIGHUP) { status_notify ("XSERVER-%d DISCONNECT-CLIENTS", display_number); - indicate_ready (); } else { @@ -90,8 +76,6 @@ static void client_disconnected_cb (XServer *server, XClient *client) { g_signal_handlers_disconnect_matched (client, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, NULL); - if (x_server_get_n_clients (server) == 0) - indicate_ready (); } static gboolean @@ -121,11 +105,35 @@ vnc_data_cb (GIOChannel *channel, GIOCondition condition, gpointer data) static void request_cb (const gchar *request) { + gchar *r; + if (!request) { g_main_loop_quit (loop); return; } + + r = g_strdup_printf ("XSERVER-%d INDICATE-READY", display_number); + if (strcmp (request, r) == 0) + { + void *handler; + + handler = signal (SIGUSR1, SIG_IGN); + if (handler == SIG_IGN) + { + status_notify ("XSERVER-%d INDICATE-READY", display_number); + kill (getppid (), SIGUSR1); + } + signal (SIGUSR1, handler); + } + g_free (r); + r = g_strdup_printf ("XSERVER-%d START-VNC", display_number); + if (strcmp (request, r) == 0) + { + /* Send server protocol version to client */ + g_print ("RFB 003.007\n"); + } + g_free (r); } int @@ -218,9 +226,6 @@ main (int argc, char **argv) if (use_inetd) { - /* Send server protocol version to client */ - g_print ("RFB 003.007\n"); - if (!g_io_add_watch (g_io_channel_unix_new (STDIN_FILENO), G_IO_IN, vnc_data_cb, NULL)) return EXIT_FAILURE; } @@ -256,9 +261,6 @@ main (int argc, char **argv) if (!x_server_start (xserver)) quit (EXIT_FAILURE); - /* Indicate ready if parent process has requested it */ - indicate_ready (); - g_main_loop_run (loop); cleanup (); |