Merge with trunk

diff --git a/tests/scripts/unity-autologin.conf b/tests/scripts/unity-autologin.conf
index dd397ded97b6aa6b599f37fbfb39af223996c665..7882e8a853adc3028ffb769d8e530fdb3b4768a6 100644 (file)
--- a/tests/scripts/unity-autologin.conf
+++ b/tests/scripts/unity-autologin.conf
@@ -10,7 +10,7 @@ user-session=default
 #?RUNNER DAEMON-START
 
 # System compositor starts
-#?UNITY-SYSTEM-COMPOSITOR START VT=7
+#?UNITY-SYSTEM-COMPOSITOR START VT=7 XDG_VTNR=7
 #?*UNITY-SYSTEM-COMPOSITOR READY
 
 # X server starts

diff --git a/tests/scripts/unity-compositor-command.conf b/tests/scripts/unity-compositor-command.conf
index 66c10edfe871f0152600d027b5e4de99011e720d..01a2b01e67338e77cf850b5cd90a006c2a253bd8 100644 (file)
--- a/tests/scripts/unity-compositor-command.conf
+++ b/tests/scripts/unity-compositor-command.conf
@@ -10,7 +10,7 @@ unity-compositor-command=unity-system-compositor --test
 #?RUNNER DAEMON-START
 
 # System compositor starts
-#?UNITY-SYSTEM-COMPOSITOR START VT=7 TEST=TRUE
+#?UNITY-SYSTEM-COMPOSITOR START VT=7 XDG_VTNR=7 TEST=TRUE
 #?*UNITY-SYSTEM-COMPOSITOR READY
 
 # X server starts

diff --git a/tests/scripts/unity-compositor-fail-ready.conf b/tests/scripts/unity-compositor-fail-ready.conf
index ef2882204049b7168427176808b2abf82d9504fb..4b847e9a45b79dde776063c0dfee523e32cc0c8e 100644 (file)
--- a/tests/scripts/unity-compositor-fail-ready.conf
+++ b/tests/scripts/unity-compositor-fail-ready.conf
@@ -9,7 +9,7 @@ unity-compositor-timeout=1
 #?RUNNER DAEMON-START
 
 # System compositor starts but doesn't indicate it is ready
-#?UNITY-SYSTEM-COMPOSITOR START VT=7
+#?UNITY-SYSTEM-COMPOSITOR START VT=7 XDG_VTNR=7
 
 # Timeout and compositor is stopped
 #?UNITY-SYSTEM-COMPOSITOR TERMINATE SIGNAL=15

diff --git a/tests/scripts/unity-compositor-fail-start.conf b/tests/scripts/unity-compositor-fail-start.conf
index 16940cfe569670c3cf8fb40b54f1d74e9529ab4a..2edcdf520c9c9b32b11a49438fe3b5c22c0a6c03 100644 (file)
--- a/tests/scripts/unity-compositor-fail-start.conf
+++ b/tests/scripts/unity-compositor-fail-start.conf
@@ -11,7 +11,7 @@ type=unity
 #?RUNNER DAEMON-START
 
 # System compositor fails to start
-#?UNITY-SYSTEM-COMPOSITOR START VT=7
+#?UNITY-SYSTEM-COMPOSITOR START VT=7 XDG_VTNR=7
 #?UNITY-SYSTEM-COMPOSITOR EXIT CODE=1
 
 # X server starts in VT mode

diff --git a/tests/scripts/unity-login.conf b/tests/scripts/unity-login.conf
index 41e5461c5a7233d47eaa12e6e512a77e283722cc..c27f70a038e48958b21a25abca74913d9f7368fb 100644 (file)
--- a/tests/scripts/unity-login.conf
+++ b/tests/scripts/unity-login.conf
@@ -9,7 +9,7 @@ user-session=default
 #?RUNNER DAEMON-START
 
 # System compositor starts
-#?UNITY-SYSTEM-COMPOSITOR START VT=7
+#?UNITY-SYSTEM-COMPOSITOR START VT=7 XDG_VTNR=7
 #?*UNITY-SYSTEM-COMPOSITOR READY
 
 # X server starts

diff --git a/tests/scripts/unity-mir-autologin.conf b/tests/scripts/unity-mir-autologin.conf
index d06b549c492326e2490827fa7cb38e44a8962d4c..61914365c43a6873d3dfa210b0c644c9da2a9dbd 100644 (file)
--- a/tests/scripts/unity-mir-autologin.conf
+++ b/tests/scripts/unity-mir-autologin.conf
@@ -10,7 +10,7 @@ user-session=mir
 #?RUNNER DAEMON-START
 
 # System compositor starts
-#?UNITY-SYSTEM-COMPOSITOR START VT=7
+#?UNITY-SYSTEM-COMPOSITOR START VT=7 XDG_VTNR=7
 #?*UNITY-SYSTEM-COMPOSITOR READY
 
 # Session starts

diff --git a/tests/scripts/unity-mir-greeter-mir-session.conf b/tests/scripts/unity-mir-greeter-mir-session.conf
index 93910cd24736491a4d190383ebce1ebb4a768077..a9935d99905ad9f0256c828a5ecde0c95c3d5c89 100644 (file)
--- a/tests/scripts/unity-mir-greeter-mir-session.conf
+++ b/tests/scripts/unity-mir-greeter-mir-session.conf
@@ -9,7 +9,7 @@ user-session=mir
 #?RUNNER DAEMON-START
 
 # System compositor starts
-#?UNITY-SYSTEM-COMPOSITOR START VT=7
+#?UNITY-SYSTEM-COMPOSITOR START VT=7 XDG_VTNR=7
 #?*UNITY-SYSTEM-COMPOSITOR READY
 
 # Greeter starts

diff --git a/tests/scripts/unity-mir-greeter-x-session.conf b/tests/scripts/unity-mir-greeter-x-session.conf
index 5352c7426ab1ee1f1f7f179b6eac79ba9d05e50b..8824b006707c75c4198c7d26262af201751b28b0 100644 (file)
--- a/tests/scripts/unity-mir-greeter-x-session.conf
+++ b/tests/scripts/unity-mir-greeter-x-session.conf
@@ -9,7 +9,7 @@ user-session=default
 #?RUNNER DAEMON-START
 
 # System compositor starts
-#?UNITY-SYSTEM-COMPOSITOR START VT=7
+#?UNITY-SYSTEM-COMPOSITOR START VT=7 XDG_VTNR=7
 #?*UNITY-SYSTEM-COMPOSITOR READY
 
 # Greeter starts

diff --git a/tests/scripts/unity-mir-session-x-greeter.conf b/tests/scripts/unity-mir-session-x-greeter.conf
index 6f41eef7fe3663fb1831cd79ea6f379690298be7..07bafa9bd8913e9fc1e6d38dde7a396fac59c523 100644 (file)
--- a/tests/scripts/unity-mir-session-x-greeter.conf
+++ b/tests/scripts/unity-mir-session-x-greeter.conf
@@ -9,7 +9,7 @@ user-session=mir
 #?RUNNER DAEMON-START
 
 # System compositor starts
-#?UNITY-SYSTEM-COMPOSITOR START VT=7
+#?UNITY-SYSTEM-COMPOSITOR START VT=7 XDG_VTNR=7
 #?*UNITY-SYSTEM-COMPOSITOR READY
 
 # X server starts

diff --git a/tests/scripts/unity-plymouth.conf b/tests/scripts/unity-plymouth.conf
index 52a3f84a670862dd169853fa1517da6fa9529dbc..d32e51deb11366be940baaac429496057d14d7ff 100644 (file)
--- a/tests/scripts/unity-plymouth.conf
+++ b/tests/scripts/unity-plymouth.conf
@@ -20,7 +20,7 @@ active=true
 #?PLYMOUTH QUIT RETAIN-SPLASH=TRUE
 
 # System compositor starts
-#?UNITY-SYSTEM-COMPOSITOR START VT=7
+#?UNITY-SYSTEM-COMPOSITOR START VT=7 XDG_VTNR=7
 #?*UNITY-SYSTEM-COMPOSITOR READY
 
 # X server starts

diff --git a/tests/scripts/unity-switch.conf b/tests/scripts/unity-switch.conf
index fec9f1c2bec70d90a2a50db05653ab966c2f1556..80210fe2b7744a95e170ce2fa6d9972aa96bbb48 100644 (file)
--- a/tests/scripts/unity-switch.conf
+++ b/tests/scripts/unity-switch.conf
@@ -10,7 +10,7 @@ user-session=default
 #?RUNNER DAEMON-START
 
 # System compositor starts
-#?UNITY-SYSTEM-COMPOSITOR START VT=7
+#?UNITY-SYSTEM-COMPOSITOR START VT=7 XDG_VTNR=7
 #?*UNITY-SYSTEM-COMPOSITOR READY
 
 # X server starts

diff --git a/tests/src/unity-system-compositor.c b/tests/src/unity-system-compositor.c
index b41a3598e8ee9a7e508f54b028818b77675f1612..2f8e42cd6f5f81ee960cd61af51a238c9a292149 100644 (file)
--- a/tests/src/unity-system-compositor.c
+++ b/tests/src/unity-system-compositor.c
@@ -179,6 +179,8 @@ main (int argc, char **argv)
     status_text = g_string_new ("UNITY-SYSTEM-COMPOSITOR START");
     if (vt_number >= 0)
         g_string_append_printf (status_text, " VT=%d", vt_number);
+    if (g_getenv ("XDG_VTNR"))
+        g_string_append_printf (status_text, " XDG_VTNR=%s", g_getenv ("XDG_VTNR"));
     if (test)
         g_string_append (status_text, " TEST=TRUE");
     status_notify (status_text->str);