summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.bzrignore2
-rw-r--r--tests/scripts/autologin-guest-logout.conf1
-rw-r--r--tests/scripts/autologin-guest.conf1
-rw-r--r--tests/scripts/login-guest-logout.conf1
-rw-r--r--tests/scripts/login-guest.conf1
-rw-r--r--tests/scripts/switch-to-guest.conf1
-rw-r--r--tests/src/Makefile.am8
-rw-r--r--tests/src/guest-account.c (renamed from tests/src/test-guest-account.c)0
8 files changed, 5 insertions, 10 deletions
diff --git a/.bzrignore b/.bzrignore
index 4a16a556..b17ab126 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -57,10 +57,10 @@ src/ldm-marshal.h
src/lightdm
tests/data/passwd
tests/src/*_moc.cpp
+tests/src/guest-account
tests/src/initctl
tests/src/plymouth
tests/src/test-gobject-greeter
-tests/src/test-guest-account
tests/src/test-qt-greeter
tests/src/test-runner
tests/src/test-script-hook
diff --git a/tests/scripts/autologin-guest-logout.conf b/tests/scripts/autologin-guest-logout.conf
index 72c9b9ad..3e2e88a1 100644
--- a/tests/scripts/autologin-guest-logout.conf
+++ b/tests/scripts/autologin-guest-logout.conf
@@ -3,7 +3,6 @@
#
[LightDM]
-guest-account-script=test-guest-account
minimum-display-number=50
[SeatDefaults]
diff --git a/tests/scripts/autologin-guest.conf b/tests/scripts/autologin-guest.conf
index 3d665f30..22ae5e58 100644
--- a/tests/scripts/autologin-guest.conf
+++ b/tests/scripts/autologin-guest.conf
@@ -3,7 +3,6 @@
#
[LightDM]
-guest-account-script=test-guest-account
minimum-display-number=50
[SeatDefaults]
diff --git a/tests/scripts/login-guest-logout.conf b/tests/scripts/login-guest-logout.conf
index 5ef6c2cd..f8dfce02 100644
--- a/tests/scripts/login-guest-logout.conf
+++ b/tests/scripts/login-guest-logout.conf
@@ -3,7 +3,6 @@
#
[LightDM]
-guest-account-script=test-guest-account
minimum-display-number=50
[test-greeter-config]
diff --git a/tests/scripts/login-guest.conf b/tests/scripts/login-guest.conf
index f444bea7..72049cf5 100644
--- a/tests/scripts/login-guest.conf
+++ b/tests/scripts/login-guest.conf
@@ -3,7 +3,6 @@
#
[LightDM]
-guest-account-script=test-guest-account
minimum-display-number=50
[test-greeter-config]
diff --git a/tests/scripts/switch-to-guest.conf b/tests/scripts/switch-to-guest.conf
index a1e56da0..40334d9a 100644
--- a/tests/scripts/switch-to-guest.conf
+++ b/tests/scripts/switch-to-guest.conf
@@ -3,7 +3,6 @@
#
[LightDM]
-guest-account-script=test-guest-account
minimum-display-number=50
[SeatDefaults]
diff --git a/tests/src/Makefile.am b/tests/src/Makefile.am
index f17e7619..db02ae26 100644
--- a/tests/src/Makefile.am
+++ b/tests/src/Makefile.am
@@ -1,4 +1,4 @@
-noinst_PROGRAMS = test-runner X test-gobject-greeter test-guest-account test-session test-script-hook initctl plymouth
+noinst_PROGRAMS = test-runner X test-gobject-greeter test-session test-script-hook guest-account initctl plymouth
noinst_SCRIPTS = lightdm-session
lib_LTLIBRARIES = libsystem.la
@@ -47,11 +47,11 @@ test_gobject_greeter_LDADD = \
$(GOBJECT_LIBS) \
$(XCB_LIBS)
-test_guest_account_SOURCES = test-guest-account.c status.c status.h
-test_guest_account_CFLAGS = \
+guest_account_SOURCES = guest-account.c status.c status.h
+guest_account_CFLAGS = \
$(WARN_CFLAGS) \
$(GLIB_CFLAGS)
-test_guest_account_LDADD = \
+guest_account_LDADD = \
$(GLIB_LIBS)
test_script_hook_SOURCES = test-script-hook.c status.c status.h
diff --git a/tests/src/test-guest-account.c b/tests/src/guest-account.c
index 66ffcc6d..66ffcc6d 100644
--- a/tests/src/test-guest-account.c
+++ b/tests/src/guest-account.c