summaryrefslogtreecommitdiff
path: root/tests/scripts
diff options
context:
space:
mode:
authorRobert Ancell <robert.ancell@canonical.com>2013-08-22 11:44:08 +1200
committerRobert Ancell <robert.ancell@canonical.com>2013-08-22 11:44:08 +1200
commit8d7c6c52e976f48d81c1b723a751a271d1d7f70d (patch)
treec687bb63e8770d393ae0df74597fc54d2609e400 /tests/scripts
parent6d135ce2a5d5f938e177bf429c55cb9bcc648425 (diff)
downloadlightdm-8d7c6c52e976f48d81c1b723a751a271d1d7f70d.tar.gz
Check XDG_VTNR number is set correctly for u-s-c
Diffstat (limited to 'tests/scripts')
-rw-r--r--tests/scripts/unity-autologin.conf2
-rw-r--r--tests/scripts/unity-compositor-command.conf2
-rw-r--r--tests/scripts/unity-compositor-fail-ready.conf2
-rw-r--r--tests/scripts/unity-compositor-fail-start.conf2
-rw-r--r--tests/scripts/unity-login.conf2
-rw-r--r--tests/scripts/unity-mir-autologin.conf2
-rw-r--r--tests/scripts/unity-mir-greeter-mir-session.conf2
-rw-r--r--tests/scripts/unity-mir-greeter-x-session.conf2
-rw-r--r--tests/scripts/unity-mir-session-x-greeter.conf2
-rw-r--r--tests/scripts/unity-plymouth.conf2
-rw-r--r--tests/scripts/unity-switch.conf2
11 files changed, 11 insertions, 11 deletions
diff --git a/tests/scripts/unity-autologin.conf b/tests/scripts/unity-autologin.conf
index 1d3d148b..fa5b1e0c 100644
--- 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 2d16d570..fa5900fe 100644
--- 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 271049e0..6068cf07 100644
--- 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 bade9353..a4dd6240 100644
--- 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 4c7e39c4..0c48b4db 100644
--- 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 f40d18ae..c9b6ca1a 100644
--- 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 c5fa6ed0..46db3a6a 100644
--- 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 01dd98de..ca0f75cc 100644
--- 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 8f913b76..b7294c4f 100644
--- 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 2594be7e..7fa2095b 100644
--- 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 ef7f20d9..9587e1f9 100644
--- 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
View Lorry Controller Status