Run all the GObject tests with the Qt greeter too

14 files changed, 39 insertions, 3 deletions

diff --git a/tests/Makefile.am b/tests/Makefile.am
index b6fa1f31..81c8ac1f 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -20,6 +20,18 @@ TESTS = \
 	test-login-gobject-guest-no-setup-script \
 	test-login-gobject-guest-fail-setup-script \
 	test-login-qt \
+	test-login-qt-manual \
+	test-login-qt-no-password \
+	test-login-qt-wrong-password \
+	test-login-qt-invalid-user \
+	test-login-qt-logout \
+	test-login-qt-xserver-crash \
+	test-login-qt-session-crash \
+	test-login-qt-guest \
+	test-login-qt-guest-no-config \
+	test-login-qt-guest-disabled \
+	test-login-qt-guest-no-setup-script \
+	test-login-qt-guest-fail-setup-script \
 	test-plymouth-active-vt \
 	test-plymouth-inactive-vt \
 	test-plymouth-xserver-fail-start \
@@ -45,8 +57,8 @@ EXTRA_DIST = \
 	scripts/autologin-logout.script \
 	scripts/headless.conf \
 	scripts/headless.script \
-	scripts/login-gobject.conf \
-	scripts/login-gobject.script \
+	scripts/login.conf \
+	scripts/login.script \
 	scripts/login-guest.conf \
 	scripts/login-guest.script \
 	scripts/login-guest-disabled.conf \
diff --git a/tests/scripts/login-manual.conf b/tests/scripts/login-manual.conf
index c345967d..375c748d 100644
--- a/tests/scripts/login-manual.conf
+++ b/tests/scripts/login-manual.conf
@@ -2,6 +2,6 @@
 seats=test-seat
 
 [test-greeter-config]
-prompt-username=true
+prompt-username=false
 username=alice
 password=password
diff --git a/tests/test-login-qt-guest b/tests/test-login-qt-guest
new file mode 100755
index 00000000..4fd3ef4d
--- /dev/null
+++ b/tests/test-login-qt-guest
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/test-runner login-guest test-qt-greeter
diff --git a/tests/test-login-qt-guest-disabled b/tests/test-login-qt-guest-disabled
new file mode 100755
index 00000000..0ee81c42
--- /dev/null
+++ b/tests/test-login-qt-guest-disabled
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/test-runner login-guest-disabled test-qt-greeter
diff --git a/tests/test-login-qt-guest-fail-setup-script b/tests/test-login-qt-guest-fail-setup-script
new file mode 100755
index 00000000..a2485727
--- /dev/null
+++ b/tests/test-login-qt-guest-fail-setup-script
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/test-runner login-guest-fail-setup-script test-qt-greeter
diff --git a/tests/test-login-qt-guest-no-config b/tests/test-login-qt-guest-no-config
new file mode 100755
index 00000000..cd351685
--- /dev/null
+++ b/tests/test-login-qt-guest-no-config
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/test-runner login-guest-no-config test-qt-greeter
diff --git a/tests/test-login-qt-guest-no-setup-script b/tests/test-login-qt-guest-no-setup-script
new file mode 100755
index 00000000..f3831b62
--- /dev/null
+++ b/tests/test-login-qt-guest-no-setup-script
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/test-runner login-guest-no-setup-script test-qt-greeter
diff --git a/tests/test-login-qt-invalid-user b/tests/test-login-qt-invalid-user
new file mode 100755
index 00000000..13c793b9
--- /dev/null
+++ b/tests/test-login-qt-invalid-user
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/test-runner login-invalid-user test-qt-greeter
diff --git a/tests/test-login-qt-logout b/tests/test-login-qt-logout
new file mode 100755
index 00000000..95584aa0
--- /dev/null
+++ b/tests/test-login-qt-logout
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/test-runner login-logout test-qt-greeter
diff --git a/tests/test-login-qt-manual b/tests/test-login-qt-manual
new file mode 100755
index 00000000..584bd803
--- /dev/null
+++ b/tests/test-login-qt-manual
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/test-runner login-manual test-qt-greeter
\ No newline at end of file
diff --git a/tests/test-login-qt-no-password b/tests/test-login-qt-no-password
new file mode 100755
index 00000000..1dc1a64f
--- /dev/null
+++ b/tests/test-login-qt-no-password
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/test-runner login-no-password test-qt-greeter
diff --git a/tests/test-login-qt-session-crash b/tests/test-login-qt-session-crash
new file mode 100755
index 00000000..6184987a
--- /dev/null
+++ b/tests/test-login-qt-session-crash
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/test-runner login-session-crash test-qt-greeter
diff --git a/tests/test-login-qt-wrong-password b/tests/test-login-qt-wrong-password
new file mode 100755
index 00000000..f6a2c0fe
--- /dev/null
+++ b/tests/test-login-qt-wrong-password
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/test-runner login-wrong-password test-qt-greeter
diff --git a/tests/test-login-qt-xserver-crash b/tests/test-login-qt-xserver-crash
new file mode 100755
index 00000000..e45d198a
--- /dev/null
+++ b/tests/test-login-qt-xserver-crash
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/test-runner login-xserver-crash test-qt-greeter