Fix up the paths in the tests

diff --git a/tests/scripts/mir-autologin.conf b/tests/scripts/mir-autologin.conf
index 449c4fbe0a333cbd19c43352b86da34595015928..6a57cd2fc8973a5ea2c552a0e5a45697d52fa1d8 100644 (file)
--- a/tests/scripts/mir-autologin.conf
+++ b/tests/scripts/mir-autologin.conf
@@ -10,7 +10,7 @@ user-session=mir
 #?RUNNER DAEMON-START
 
 # System compositor starts
-#?UNITY-SYSTEM-COMPOSITOR START FILE=/tmp/lightdm-mir-0 VT=7 ENABLE-HARDWARE-CURSOR=TRUE XDG_VTNR=7
+#?UNITY-SYSTEM-COMPOSITOR START FILE=/run/lightdm-mir-0 VT=7 ENABLE-HARDWARE-CURSOR=TRUE XDG_VTNR=7
 #?*UNITY-SYSTEM-COMPOSITOR READY
 
 # Session starts

diff --git a/tests/scripts/mir-greeter.conf b/tests/scripts/mir-greeter.conf
index 3149936a4cc7d2f78aab647c3aabba61d460d14c..137bd32c6db0c140d818aefc2f09eb413b47656b 100644 (file)
--- a/tests/scripts/mir-greeter.conf
+++ b/tests/scripts/mir-greeter.conf
@@ -6,7 +6,7 @@
 #?RUNNER DAEMON-START
 
 # System compositor starts
-#?UNITY-SYSTEM-COMPOSITOR START FILE=/tmp/lightdm-mir-0 VT=7 ENABLE-HARDWARE-CURSOR=TRUE XDG_VTNR=7
+#?UNITY-SYSTEM-COMPOSITOR START FILE=/run/lightdm-mir-0 VT=7 ENABLE-HARDWARE-CURSOR=TRUE XDG_VTNR=7
 #?*UNITY-SYSTEM-COMPOSITOR READY
 
 # Greeter starts

diff --git a/tests/scripts/mir-session-compositor-crash.conf b/tests/scripts/mir-session-compositor-crash.conf
index 7f18841997a062b688a990d17134d8ea5046fd96..e0eb42b16a085902368899b2f0f18e470f0b9d94 100644 (file)
--- a/tests/scripts/mir-session-compositor-crash.conf
+++ b/tests/scripts/mir-session-compositor-crash.conf
@@ -10,7 +10,7 @@ user-session=mir
 #?RUNNER DAEMON-START
 
 # System compositor starts
-#?UNITY-SYSTEM-COMPOSITOR START FILE=/tmp/lightdm-mir-0 VT=7 ENABLE-HARDWARE-CURSOR=TRUE XDG_VTNR=7
+#?UNITY-SYSTEM-COMPOSITOR START FILE=/run/lightdm-mir-0 VT=7 ENABLE-HARDWARE-CURSOR=TRUE XDG_VTNR=7
 #?*UNITY-SYSTEM-COMPOSITOR READY
 
 # Session starts

diff --git a/tests/scripts/mir-session-crash.conf b/tests/scripts/mir-session-crash.conf
index a5c974e7c04c99fd82de0e9d1106214302ca6156..934002531e8118e10c0edf8697c48cfc27720b74 100644 (file)
--- a/tests/scripts/mir-session-crash.conf
+++ b/tests/scripts/mir-session-crash.conf
@@ -10,7 +10,7 @@ user-session=mir
 #?RUNNER DAEMON-START
 
 # System compositor starts
-#?UNITY-SYSTEM-COMPOSITOR START FILE=/tmp/lightdm-mir-0 VT=7 ENABLE-HARDWARE-CURSOR=TRUE XDG_VTNR=7
+#?UNITY-SYSTEM-COMPOSITOR START FILE=/run/lightdm-mir-0 VT=7 ENABLE-HARDWARE-CURSOR=TRUE XDG_VTNR=7
 #?*UNITY-SYSTEM-COMPOSITOR READY
 
 # Session starts

diff --git a/tests/scripts/mir-session.conf b/tests/scripts/mir-session.conf
index 3b7ae8115d9d8153294248d988e9b10eef5df925..2e4b06f29e68150b991a1cee4ba15adc76f37706 100644 (file)
--- a/tests/scripts/mir-session.conf
+++ b/tests/scripts/mir-session.conf
@@ -30,7 +30,7 @@ user-session=mir
 #?*GREETER-X-0 START-SESSION
 
 # System compositor starts
-#?UNITY-SYSTEM-COMPOSITOR START FILE=/tmp/lightdm-mir-0 VT=8 ENABLE-HARDWARE-CURSOR=TRUE XDG_VTNR=8
+#?UNITY-SYSTEM-COMPOSITOR START FILE=/run/lightdm-mir-0 VT=8 ENABLE-HARDWARE-CURSOR=TRUE XDG_VTNR=8
 #?*UNITY-SYSTEM-COMPOSITOR READY
 
 # Switch to system compositor

diff --git a/tests/scripts/unity-autologin.conf b/tests/scripts/unity-autologin.conf
index 918681a9397fe6d02ff0e538953f9ab072de8ea2..63a99702067296df7f8cf37653558c0a8b2055de 100644 (file)
--- a/tests/scripts/unity-autologin.conf
+++ b/tests/scripts/unity-autologin.conf
@@ -11,7 +11,7 @@ user-session=default
 #?RUNNER DAEMON-START
 
 # System compositor starts
-#?UNITY-SYSTEM-COMPOSITOR START FILE=/tmp/mir_socket VT=7 XDG_VTNR=7
+#?UNITY-SYSTEM-COMPOSITOR START FILE=/run/mir_socket 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 49612e85bbd4fa36a295a05c6aa2d3b97f0e7649..ab4d06c5243677e1a0772f4dbf8eaab0e7133ac0 100644 (file)
--- a/tests/scripts/unity-compositor-command.conf
+++ b/tests/scripts/unity-compositor-command.conf
@@ -11,7 +11,7 @@ unity-compositor-command=unity-system-compositor --test
 #?RUNNER DAEMON-START
 
 # System compositor starts
-#?UNITY-SYSTEM-COMPOSITOR START FILE=/tmp/mir_socket VT=7 XDG_VTNR=7 TEST=TRUE
+#?UNITY-SYSTEM-COMPOSITOR START FILE=/run/mir_socket VT=7 XDG_VTNR=7 TEST=TRUE
 #?*UNITY-SYSTEM-COMPOSITOR READY
 
 # X server starts

diff --git a/tests/scripts/unity-compositor-crash.conf b/tests/scripts/unity-compositor-crash.conf
index c9ffc6e05853144b67d9802a95d62922d836d6f8..0994fd78b6ebe94d038631663d85d5cbdaae9879 100644 (file)
--- a/tests/scripts/unity-compositor-crash.conf
+++ b/tests/scripts/unity-compositor-crash.conf
@@ -9,7 +9,7 @@ type=unity
 #?RUNNER DAEMON-START
 
 # System compositor starts
-#?UNITY-SYSTEM-COMPOSITOR START FILE=/tmp/mir_socket VT=7 XDG_VTNR=7
+#?UNITY-SYSTEM-COMPOSITOR START FILE=/run/mir_socket VT=7 XDG_VTNR=7
 #?*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 e676eb2ceba7b47231175bd507cfadef3d5fce46..3d2cc6acfaa04f188ee0b3d8b4fd66d9fda93558 100644 (file)
--- a/tests/scripts/unity-compositor-fail-ready.conf
+++ b/tests/scripts/unity-compositor-fail-ready.conf
@@ -10,7 +10,7 @@ unity-compositor-timeout=1
 #?RUNNER DAEMON-START
 
 # System compositor starts but doesn't indicate it is ready
-#?UNITY-SYSTEM-COMPOSITOR START FILE=/tmp/mir_socket VT=7 XDG_VTNR=7
+#?UNITY-SYSTEM-COMPOSITOR START FILE=/run/mir_socket 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 ac8a3e0ba99f58c26c9894605edc09bc643b7e5f..84a37aa40509e5323d5c60b6d53987d5a163708c 100644 (file)
--- a/tests/scripts/unity-compositor-fail-start.conf
+++ b/tests/scripts/unity-compositor-fail-start.conf
@@ -12,7 +12,7 @@ type=unity
 #?RUNNER DAEMON-START
 
 # System compositor fails to start
-#?UNITY-SYSTEM-COMPOSITOR START FILE=/tmp/mir_socket VT=7 XDG_VTNR=7
+#?UNITY-SYSTEM-COMPOSITOR START FILE=/run/mir_socket VT=7 XDG_VTNR=7
 #?UNITY-SYSTEM-COMPOSITOR EXIT CODE=1
 
 # Daemon exits with error code

diff --git a/tests/scripts/unity-compositor-fallback.conf b/tests/scripts/unity-compositor-fallback.conf
index 4ceb1369ae2913437346be327bec65dfd88cc305..e6033da5ad6f00ef30b96755771f9457935343c4 100644 (file)
--- a/tests/scripts/unity-compositor-fallback.conf
+++ b/tests/scripts/unity-compositor-fallback.conf
@@ -12,11 +12,11 @@ type=unity;INVALID;unity;xlocal;
 #?RUNNER DAEMON-START
 
 # System compositor fails to start
-#?UNITY-SYSTEM-COMPOSITOR START FILE=/tmp/mir_socket VT=7 XDG_VTNR=7
+#?UNITY-SYSTEM-COMPOSITOR START FILE=/run/mir_socket VT=7 XDG_VTNR=7
 #?UNITY-SYSTEM-COMPOSITOR EXIT CODE=1
 
 # System compositor fails to start a second time
-#?UNITY-SYSTEM-COMPOSITOR START FILE=/tmp/mir_socket VT=7 XDG_VTNR=7
+#?UNITY-SYSTEM-COMPOSITOR START FILE=/run/mir_socket VT=7 XDG_VTNR=7
 #?UNITY-SYSTEM-COMPOSITOR EXIT CODE=1
 
 # X server starts in VT mode

diff --git a/tests/scripts/unity-compositor-mir-next-session.conf b/tests/scripts/unity-compositor-mir-next-session.conf
index 2ff68bd284062a2361ae15bc41fbae318dd61ad0..c2bd8e5fdfd12cc47e1ddeec41106a027e9eb734 100644 (file)
--- a/tests/scripts/unity-compositor-mir-next-session.conf
+++ b/tests/scripts/unity-compositor-mir-next-session.conf
@@ -12,7 +12,7 @@ autologin-in-background=true
 #?RUNNER DAEMON-START
 
 # System compositor
-#?UNITY-SYSTEM-COMPOSITOR START FILE=/tmp/mir_socket VT=7 XDG_VTNR=7
+#?UNITY-SYSTEM-COMPOSITOR START FILE=/run/mir_socket VT=7 XDG_VTNR=7
 #?*UNITY-SYSTEM-COMPOSITOR READY
 
 # Greeter session

diff --git a/tests/scripts/unity-compositor-next-session.conf b/tests/scripts/unity-compositor-next-session.conf
index 3bf2cd51a8a3e60e76f147f0699c42d8bb308e3d..6e7396e66548e3bffbfbf432ad3b4a41c9426a62 100644 (file)
--- a/tests/scripts/unity-compositor-next-session.conf
+++ b/tests/scripts/unity-compositor-next-session.conf
@@ -12,7 +12,7 @@ autologin-in-background=true
 #?RUNNER DAEMON-START
 
 # System compositor
-#?UNITY-SYSTEM-COMPOSITOR START FILE=/tmp/mir_socket VT=7 XDG_VTNR=7
+#?UNITY-SYSTEM-COMPOSITOR START FILE=/run/mir_socket VT=7 XDG_VTNR=7
 #?*UNITY-SYSTEM-COMPOSITOR READY
 
 # Greeter session

diff --git a/tests/scripts/unity-login.conf b/tests/scripts/unity-login.conf
index c960cbd1f8320d1eba857df22b9eb9a0faa9ef7b..74e8dac7f4cff3180255603f47495ed4196d7550 100644 (file)
--- a/tests/scripts/unity-login.conf
+++ b/tests/scripts/unity-login.conf
@@ -10,7 +10,7 @@ user-session=default
 #?RUNNER DAEMON-START
 
 # System compositor starts
-#?UNITY-SYSTEM-COMPOSITOR START FILE=/tmp/mir_socket VT=7 XDG_VTNR=7
+#?UNITY-SYSTEM-COMPOSITOR START FILE=/run/mir_socket 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 43e714116c5941098830300be799e1c9a4e70b97..77fde3e4ad0ce0dc05562f9c43a70d31e7fa77ff 100644 (file)
--- a/tests/scripts/unity-mir-autologin.conf
+++ b/tests/scripts/unity-mir-autologin.conf
@@ -11,7 +11,7 @@ user-session=mir
 #?RUNNER DAEMON-START
 
 # System compositor starts
-#?UNITY-SYSTEM-COMPOSITOR START FILE=/tmp/mir_socket VT=7 XDG_VTNR=7
+#?UNITY-SYSTEM-COMPOSITOR START FILE=/run/mir_socket 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 a8532228941df8a0ad713bd2d6ff3bb2053e1767..5db4a20802208686efbcccee32d84f6d799fa433 100644 (file)
--- a/tests/scripts/unity-mir-greeter-mir-session.conf
+++ b/tests/scripts/unity-mir-greeter-mir-session.conf
@@ -10,7 +10,7 @@ user-session=mir
 #?RUNNER DAEMON-START
 
 # System compositor starts
-#?UNITY-SYSTEM-COMPOSITOR START FILE=/tmp/mir_socket VT=7 XDG_VTNR=7
+#?UNITY-SYSTEM-COMPOSITOR START FILE=/run/mir_socket 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 0a1851416fa9a2d72c77b1dff20b7e02003e0811..1aeda18c1215264e9e01a793d7da80f84363ccf0 100644 (file)
--- a/tests/scripts/unity-mir-greeter-x-session.conf
+++ b/tests/scripts/unity-mir-greeter-x-session.conf
@@ -10,7 +10,7 @@ user-session=default
 #?RUNNER DAEMON-START
 
 # System compositor starts
-#?UNITY-SYSTEM-COMPOSITOR START FILE=/tmp/mir_socket VT=7 XDG_VTNR=7
+#?UNITY-SYSTEM-COMPOSITOR START FILE=/run/mir_socket VT=7 XDG_VTNR=7
 #?*UNITY-SYSTEM-COMPOSITOR READY
 
 # Greeter starts

diff --git a/tests/scripts/unity-mir-lock-seat.conf b/tests/scripts/unity-mir-lock-seat.conf
index a803916923a9f58e92a7d2be2a0ff198771ded4a..300e1b12f8a843de0d8862d3c22ae96c92a5026d 100644 (file)
--- a/tests/scripts/unity-mir-lock-seat.conf
+++ b/tests/scripts/unity-mir-lock-seat.conf
@@ -11,7 +11,7 @@ user-session=mir
 #?RUNNER DAEMON-START
 
 # System compositor starts
-#?UNITY-SYSTEM-COMPOSITOR START FILE=/tmp/mir_socket VT=7 XDG_VTNR=7
+#?UNITY-SYSTEM-COMPOSITOR START FILE=/run/mir_socket VT=7 XDG_VTNR=7
 #?*UNITY-SYSTEM-COMPOSITOR READY
 
 # Session starts

diff --git a/tests/scripts/unity-mir-session-x-greeter.conf b/tests/scripts/unity-mir-session-x-greeter.conf
index b7f59c42cc024c0f8367124e17950da13f7026b2..7937d86fc2c49330b83b443289a49b2e8ea1cfc2 100644 (file)
--- a/tests/scripts/unity-mir-session-x-greeter.conf
+++ b/tests/scripts/unity-mir-session-x-greeter.conf
@@ -10,7 +10,7 @@ user-session=mir
 #?RUNNER DAEMON-START
 
 # System compositor starts
-#?UNITY-SYSTEM-COMPOSITOR START FILE=/tmp/mir_socket VT=7 XDG_VTNR=7
+#?UNITY-SYSTEM-COMPOSITOR START FILE=/run/mir_socket VT=7 XDG_VTNR=7
 #?*UNITY-SYSTEM-COMPOSITOR READY
 
 # X server starts

diff --git a/tests/scripts/unity-mir-switch-to-user-resettable.conf b/tests/scripts/unity-mir-switch-to-user-resettable.conf
index e594c047008b5a0ff817cba507dac05bb274d391..1fe7038d6bf1a1e5d8238dc152ebeeb62e9a994e 100644 (file)
--- a/tests/scripts/unity-mir-switch-to-user-resettable.conf
+++ b/tests/scripts/unity-mir-switch-to-user-resettable.conf
@@ -14,7 +14,7 @@ resettable=true
 #?RUNNER DAEMON-START
 
 # System compositor starts
-#?UNITY-SYSTEM-COMPOSITOR START FILE=/tmp/mir_socket VT=7 XDG_VTNR=7
+#?UNITY-SYSTEM-COMPOSITOR START FILE=/run/mir_socket VT=7 XDG_VTNR=7
 #?*UNITY-SYSTEM-COMPOSITOR READY
 
 # Greeter starts

diff --git a/tests/scripts/unity-plymouth.conf b/tests/scripts/unity-plymouth.conf
index 9d05aae73c95f568253770044d72c0c5bcdd0aab..feae1adfe7f592f4468ee59c0fb39c84c87c7d9f 100644 (file)
--- a/tests/scripts/unity-plymouth.conf
+++ b/tests/scripts/unity-plymouth.conf
@@ -21,7 +21,7 @@ active=true
 #?PLYMOUTH QUIT RETAIN-SPLASH=TRUE
 
 # System compositor starts
-#?UNITY-SYSTEM-COMPOSITOR START FILE=/tmp/mir_socket VT=7 XDG_VTNR=7
+#?UNITY-SYSTEM-COMPOSITOR START FILE=/run/mir_socket 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 73b607979caf6f251e68368e101622392c6acb64..6287eae992de6a5e928f523018d922ec33048f1e 100644 (file)
--- a/tests/scripts/unity-switch.conf
+++ b/tests/scripts/unity-switch.conf
@@ -11,7 +11,7 @@ user-session=default
 #?RUNNER DAEMON-START
 
 # System compositor starts
-#?UNITY-SYSTEM-COMPOSITOR START FILE=/tmp/mir_socket VT=7 XDG_VTNR=7
+#?UNITY-SYSTEM-COMPOSITOR START FILE=/run/mir_socket VT=7 XDG_VTNR=7
 #?*UNITY-SYSTEM-COMPOSITOR READY
 
 # X server starts

diff --git a/tests/scripts/unity-xdg-seat.conf b/tests/scripts/unity-xdg-seat.conf
index aeb19e604bf26e29baa6d2912c4d363039005689..f92161e8f5e7642e97d8957be06be953c49280bc 100644 (file)
--- a/tests/scripts/unity-xdg-seat.conf
+++ b/tests/scripts/unity-xdg-seat.conf
@@ -12,7 +12,7 @@ xdg-seat=seat1
 #?RUNNER DAEMON-START
 
 # System compositor starts
-#?UNITY-SYSTEM-COMPOSITOR START FILE=/tmp/mir_socket VT=7 XDG_VTNR=7
+#?UNITY-SYSTEM-COMPOSITOR START FILE=/run/mir_socket VT=7 XDG_VTNR=7
 #?*UNITY-SYSTEM-COMPOSITOR READY
 
 # X server starts