Merge with trunk

[sojka/lightdm.git] / tests / Makefile.am

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 3e5dca298a7b4caf4207526a80691812b2e5863d..5f9e4bb44fe8924b313381a5f43abeebe3826e4a 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -190,6 +190,7 @@ TESTS = \
        test-mir-session-crash \
        test-mir-session-compositor-crash \
        test-mir-container-session \
+       test-mir-script-hooks \
        test-unity-compositor-command \
        test-unity-compositor-not-found \
        test-unity-compositor-fail-start \
@@ -202,13 +203,15 @@ TESTS = \
        test-unity-login \
        test-unity-switch \
        test-unity-plymouth \
+       test-unity-script-hooks \
        test-unity-mir-autologin \
        test-unity-mir-greeter-x-session \
        test-unity-mir-greeter-mir-session \
        test-unity-mir-lock-seat \
        test-unity-mir-session-x-greeter \
        test-unity-mir-switch \
-       test-unity-mir-switch-to-user-resettable
+       test-unity-mir-switch-to-user-resettable \
+       test-unity-mir-script-hooks
 
 #      test-session-exit-error
 #      test-greeter-no-exit
@@ -443,6 +446,7 @@ EXTRA_DIST = \
        scripts/mir-autologin.conf \
        scripts/mir-container-session.conf \
        scripts/mir-greeter.conf \
+       scripts/mir-script-hooks.conf \
        scripts/mir-session.conf \
        scripts/mir-session-compositor-crash.conf \
        scripts/mir-session-crash.conf \
@@ -516,10 +520,12 @@ EXTRA_DIST = \
        scripts/unity-mir-greeter-mir-session.conf \
        scripts/unity-mir-lock-seat.conf \
        scripts/unity-mir-greeter-x-session.conf \
+       scripts/unity-mir-script-hooks.conf \
        scripts/unity-mir-session-x-greeter.conf \
        scripts/unity-mir-switch.conf \
        scripts/unity-mir-switch-to-user-resettable.conf \
        scripts/unity-plymouth.conf \
+       scripts/unity-script-hooks.conf \
        scripts/unity-switch.conf \
        scripts/upstart-autologin.conf \
        scripts/upstart-login.conf \