add qt5 tests in addition to qt4 tests

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 487ca287cdee16bccabb8bac79544224e29cac9e..33965f9ac296c0c1627303b2001eeb14c8bee6c9 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -133,30 +133,58 @@ TESTS = \
 
 if COMPILE_LIBLIGHTDM_QT4
 TESTS += \
-       test-autologin-qt-timeout \
-       test-autologin-qt-guest-timeout \
-       test-login-qt \
-       test-login-qt-manual \
-       test-login-qt-manual-previous-session \
-       test-login-qt-no-password \
-       test-login-qt-long-username \
-       test-login-qt-long-password \
-       test-login-qt-two-factor \
-       test-login-qt-new-authtok \
-       test-login-qt-info-prompt \
-       test-login-qt-multi-info-prompt \
-       test-login-qt-previous-session \
-       test-login-qt-wrong-password \
-       test-login-qt-invalid-user \
-       test-login-qt-invalid-session \
-       test-login-qt-logout \
-       test-login-qt-pick-session \
-       test-login-qt-guest \
-       test-login-qt-guest-disabled \
-       test-login-qt-guest-no-setup-script \
-       test-login-qt-guest-fail-setup-script \
-       test-login-qt-guest-logout \
-       test-login-qt-remote-session
+       test-autologin-qt4-timeout \
+       test-autologin-qt4-guest-timeout \
+       test-login-qt4 \
+       test-login-qt4-manual \
+       test-login-qt4-manual-previous-session \
+       test-login-qt4-no-password \
+       test-login-qt4-long-username \
+       test-login-qt4-long-password \
+       test-login-qt4-two-factor \
+       test-login-qt4-new-authtok \
+       test-login-qt4-info-prompt \
+       test-login-qt4-multi-info-prompt \
+       test-login-qt4-previous-session \
+       test-login-qt4-wrong-password \
+       test-login-qt4-invalid-user \
+       test-login-qt4-invalid-session \
+       test-login-qt4-logout \
+       test-login-qt4-pick-session \
+       test-login-qt4-guest \
+       test-login-qt4-guest-disabled \
+       test-login-qt4-guest-no-setup-script \
+       test-login-qt4-guest-fail-setup-script \
+       test-login-qt4-guest-logout \
+       test-login-qt4-remote-session
+endif
+
+if COMPILE_LIBLIGHTDM_QT5
+TESTS += \
+       test-autologin-qt5-timeout \
+       test-autologin-qt5-guest-timeout \
+       test-login-qt5 \
+       test-login-qt5-manual \
+       test-login-qt5-manual-previous-session \
+       test-login-qt5-no-password \
+       test-login-qt5-long-username \
+       test-login-qt5-long-password \
+       test-login-qt5-two-factor \
+       test-login-qt5-new-authtok \
+       test-login-qt5-info-prompt \
+       test-login-qt5-multi-info-prompt \
+       test-login-qt5-previous-session \
+       test-login-qt5-wrong-password \
+       test-login-qt5-invalid-user \
+       test-login-qt5-invalid-session \
+       test-login-qt5-logout \
+       test-login-qt5-pick-session \
+       test-login-qt5-guest \
+       test-login-qt5-guest-disabled \
+       test-login-qt5-guest-no-setup-script \
+       test-login-qt5-guest-fail-setup-script \
+       test-login-qt5-guest-logout \
+       test-login-qt5-remote-session
 endif
 
 EXTRA_DIST = \
@@ -166,7 +194,8 @@ EXTRA_DIST = \
        data/session.conf \
        data/xgreeters/test-gobject-greeter.desktop \
        data/xgreeters/test-python-greeter.desktop \
-       data/xgreeters/test-qt-greeter.desktop \
+       data/xgreeters/test-qt4-greeter.desktop \
+       data/xgreeters/test-qt5-greeter.desktop \
        data/xsessions/alternative.desktop \
        data/xsessions/default.desktop \
        scripts/autologin.conf \

diff --git a/tests/data/xgreeters/test-qt-greeter.desktop b/tests/data/xgreeters/test-qt-greeter.desktop
deleted file mode 100644 (file)
index 64870e6..0000000
--- a/tests/data/xgreeters/test-qt-greeter.desktop
+++ /dev/null
@@ -1,4 +0,0 @@
-[Desktop Entry]
-Name=Test Qt Greeter
-Comment=LightDM test Qt greeter
-Exec=test-qt-greeter

diff --git a/tests/data/xgreeters/test-qt4-greeter.desktop b/tests/data/xgreeters/test-qt4-greeter.desktop
new file mode 100644 (file)
index 0000000..ec8a650
--- /dev/null
+++ b/tests/data/xgreeters/test-qt4-greeter.desktop
@@ -0,0 +1,4 @@
+[Desktop Entry]
+Name=Test Qt4 Greeter
+Comment=LightDM test Qt4 greeter
+Exec=test-qt4-greeter

diff --git a/tests/data/xgreeters/test-qt5-greeter.desktop b/tests/data/xgreeters/test-qt5-greeter.desktop
new file mode 100644 (file)
index 0000000..7a32221
--- /dev/null
+++ b/tests/data/xgreeters/test-qt5-greeter.desktop
@@ -0,0 +1,4 @@
+[Desktop Entry]
+Name=Test Qt5 Greeter
+Comment=LightDM test Qt5 greeter
+Exec=test-qt5-greeter

diff --git a/tests/src/Makefile.am b/tests/src/Makefile.am
index d3678e48cefcc6e232260175cc1bfacb82218266..46011cbfec84d1cbd4803d188ce061488c720cfb 100644 (file)
--- a/tests/src/Makefile.am
+++ b/tests/src/Makefile.am
@@ -15,7 +15,11 @@ libsystem_la_LIBADD = -ldl $(GLIB_LIBS)
 libsystem_la_LDFLAGS = -rpath /nowhere
 
 if COMPILE_LIBLIGHTDM_QT4
-noinst_PROGRAMS += test-qt-greeter
+noinst_PROGRAMS += test-qt4-greeter
+endif
+
+if COMPILE_LIBLIGHTDM_QT5
+noinst_PROGRAMS += test-qt5-greeter
 endif
 
 dbus_env_CFLAGS = \
@@ -96,25 +100,45 @@ test_script_hook_LDADD = \
        $(GLIB_LIBS) \
        $(GIO_UNIX_LIBS)
 
-test-qt-greeter_moc.cpp: test-qt-greeter.h
-       $(MOC) $< -o $@
-test_qt_greeter_SOURCES = test-qt-greeter.cpp test-qt-greeter.h status.c status.h
-nodist_test_qt_greeter_SOURCES = test-qt-greeter_moc.cpp
-test_qt_greeter_CFLAGS = \
+test-qt4-greeter_moc4.cpp: test-qt-greeter.h
+       $(MOC4) $< -o $@
+test-qt5-greeter_moc5.cpp: test-qt-greeter.h
+       $(MOC5) $< -o $@
+common_qt_sources = test-qt-greeter.cpp test-qt-greeter.h status.c status.h
+test_qt4_greeter_SOURCES = $(common_qt_sources)
+test_qt5_greeter_SOURCES = $(common_qt_sources)
+nodist_test_qt4_greeter_SOURCES = test-qt4-greeter_moc4.cpp
+nodist_test_qt5_greeter_SOURCES = test-qt5-greeter_moc5.cpp
+common_qt_cflags = \
        $(GLIB_CFLAGS) \
        $(GIO_UNIX_CFLAGS) \
        $(XCB_CFLAGS)
-test_qt_greeter_CXXFLAGS = \
+test_qt4_greeter_CFLAGS = $(common_qt_cflags)
+test_qt5_greeter_CFLAGS = $(common_qt_cflags)
+common_qt_cxxflags = \
+       -fPIC \
+       -DQT_DISABLE_DEPRECATED_BEFORE="QT_VERSION_CHECK(4, 0, 0)" \
        -I$(top_srcdir)/liblightdm-qt \
-       $(LIBLIGHTDM_QT4_CFLAGS) \
        $(GLIB_CFLAGS)
-test_qt_greeter_LDADD = \
+test_qt4_greeter_CXXFLAGS = \
+       $(common_qt_cxxflags) \
+       $(LIBLIGHTDM_QT4_CFLAGS)
+test_qt5_greeter_CXXFLAGS = \
+       $(common_qt_cxxflags) \
+       $(LIBLIGHTDM_QT5_CFLAGS)
+common_qt_ldadd = \
        -L$(top_builddir)/liblightdm-qt \
-       -llightdm-qt-2 \
-       $(LIBLIGHTDM_QT4_LIBS) \
        $(GLIB_LIBS) \
        $(GIO_UNIX_LIBS) \
        $(XCB_LIBS)
+test_qt4_greeter_LDADD = \
+       $(common_qt_ldadd) \
+       -llightdm-qt-2 \
+       $(LIBLIGHTDM_QT4_LIBS)
+test_qt5_greeter_LDADD = \
+       $(common_qt_ldadd) \
+       -llightdm-qt5-2 \
+       $(LIBLIGHTDM_QT5_LIBS)
 
 test_session_SOURCES = test-session.c status.c status.h
 test_session_CFLAGS = \
@@ -157,4 +181,5 @@ vnc_client_LDADD = \
        $(GIO_UNIX_LIBS)
 
 CLEANFILES = \
-       test-qt-greeter_moc.cpp
+       test-qt4-greeter_moc4.cpp \
+       test-qt5-greeter_moc5.cpp

diff --git a/tests/test-autologin-qt-timeout b/tests/test-autologin-qt-timeout
deleted file mode 100755 (executable)
index d26e044..0000000
--- a/tests/test-autologin-qt-timeout
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-./src/dbus-env ./src/test-runner autologin-timeout test-qt-greeter

diff --git a/tests/test-autologin-qt-guest-timeout b/tests/test-autologin-qt4-guest-timeout
similarity index 88%
rename from tests/test-autologin-qt-guest-timeout
rename to tests/test-autologin-qt4-guest-timeout
index ba71d6b08f76d445b116e2d88bd6eb14a5079f85..07657c0e0dbca7171e2c61f816b22de3354b10c2 100755 (executable)
--- a/tests/test-autologin-qt-guest-timeout
+++ b/tests/test-autologin-qt4-guest-timeout
@@ -1,2 +1,2 @@
 #!/bin/sh
-./src/dbus-env ./src/test-runner autologin-guest-timeout test-qt-greeter
+./src/dbus-env ./src/test-runner autologin-guest-timeout test-qt4-greeter

diff --git a/tests/test-autologin-qt4-timeout b/tests/test-autologin-qt4-timeout
new file mode 100755 (executable)
index 0000000..3b928c4
--- /dev/null
+++ b/tests/test-autologin-qt4-timeout
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner autologin-timeout test-qt4-greeter

diff --git a/tests/test-autologin-qt5-guest-timeout b/tests/test-autologin-qt5-guest-timeout
new file mode 100755 (executable)
index 0000000..7e88255
--- /dev/null
+++ b/tests/test-autologin-qt5-guest-timeout
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner autologin-guest-timeout test-qt5-greeter

diff --git a/tests/test-autologin-qt5-timeout b/tests/test-autologin-qt5-timeout
new file mode 100755 (executable)
index 0000000..bb66b71
--- /dev/null
+++ b/tests/test-autologin-qt5-timeout
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner autologin-timeout test-qt5-greeter

diff --git a/tests/test-login-qt b/tests/test-login-qt
deleted file mode 100755 (executable)
index 9de979e..0000000
--- a/tests/test-login-qt
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-./src/dbus-env ./src/test-runner login test-qt-greeter

diff --git a/tests/test-login-qt-guest b/tests/test-login-qt-guest
deleted file mode 100755 (executable)
index 6dd477a..0000000
--- a/tests/test-login-qt-guest
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-./src/dbus-env ./src/test-runner login-guest test-qt-greeter

diff --git a/tests/test-login-qt-guest-disabled b/tests/test-login-qt-guest-disabled
deleted file mode 100755 (executable)
index b436fcd..0000000
--- a/tests/test-login-qt-guest-disabled
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-./src/dbus-env ./src/test-runner login-guest-disabled test-qt-greeter

diff --git a/tests/test-login-qt-guest-logout b/tests/test-login-qt-guest-logout
deleted file mode 100755 (executable)
index 9ab7280..0000000
--- a/tests/test-login-qt-guest-logout
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-./src/dbus-env ./src/test-runner login-guest-logout test-qt-greeter

diff --git a/tests/test-login-qt-info-prompt b/tests/test-login-qt-info-prompt
deleted file mode 100755 (executable)
index 29df469..0000000
--- a/tests/test-login-qt-info-prompt
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-./src/dbus-env ./src/test-runner login-info-prompt test-qt-greeter

diff --git a/tests/test-login-qt-invalid-session b/tests/test-login-qt-invalid-session
deleted file mode 100755 (executable)
index 00d6022..0000000
--- a/tests/test-login-qt-invalid-session
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-./src/dbus-env ./src/test-runner login-invalid-session test-qt-greeter

diff --git a/tests/test-login-qt-invalid-user b/tests/test-login-qt-invalid-user
deleted file mode 100755 (executable)
index 09a39d4..0000000
--- a/tests/test-login-qt-invalid-user
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-./src/dbus-env ./src/test-runner login-invalid-user test-qt-greeter

diff --git a/tests/test-login-qt-logout b/tests/test-login-qt-logout
deleted file mode 100755 (executable)
index a42b885..0000000
--- a/tests/test-login-qt-logout
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-./src/dbus-env ./src/test-runner login-logout test-qt-greeter

diff --git a/tests/test-login-qt-long-password b/tests/test-login-qt-long-password
deleted file mode 100755 (executable)
index 9a0aaa7..0000000
--- a/tests/test-login-qt-long-password
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-./src/dbus-env ./src/test-runner login-long-password test-qt-greeter

diff --git a/tests/test-login-qt-long-username b/tests/test-login-qt-long-username
deleted file mode 100755 (executable)
index e0219b8..0000000
--- a/tests/test-login-qt-long-username
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-./src/dbus-env ./src/test-runner login-long-username test-qt-greeter

diff --git a/tests/test-login-qt-manual b/tests/test-login-qt-manual
deleted file mode 100755 (executable)
index db61be5..0000000
--- a/tests/test-login-qt-manual
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-./src/dbus-env ./src/test-runner login-manual test-qt-greeter

diff --git a/tests/test-login-qt-new-authtok b/tests/test-login-qt-new-authtok
deleted file mode 100755 (executable)
index 7ce6b57..0000000
--- a/tests/test-login-qt-new-authtok
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-./src/dbus-env ./src/test-runner login-new-authtok test-qt-greeter

diff --git a/tests/test-login-qt-no-password b/tests/test-login-qt-no-password
deleted file mode 100755 (executable)
index e699225..0000000
--- a/tests/test-login-qt-no-password
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-./src/dbus-env ./src/test-runner login-no-password test-qt-greeter

diff --git a/tests/test-login-qt-pick-session b/tests/test-login-qt-pick-session
deleted file mode 100755 (executable)
index 1628f5a..0000000
--- a/tests/test-login-qt-pick-session
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-./src/dbus-env ./src/test-runner login-pick-session test-qt-greeter

diff --git a/tests/test-login-qt-previous-session b/tests/test-login-qt-previous-session
deleted file mode 100755 (executable)
index 0ba8bfd..0000000
--- a/tests/test-login-qt-previous-session
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-./src/dbus-env ./src/test-runner login-previous-session test-qt-greeter

diff --git a/tests/test-login-qt-remote-session b/tests/test-login-qt-remote-session
deleted file mode 100755 (executable)
index 427afe4..0000000
--- a/tests/test-login-qt-remote-session
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-./src/dbus-env ./src/test-runner login-remote-session test-qt-greeter

diff --git a/tests/test-login-qt-two-factor b/tests/test-login-qt-two-factor
deleted file mode 100755 (executable)
index 0461291..0000000
--- a/tests/test-login-qt-two-factor
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-./src/dbus-env ./src/test-runner login-two-factor test-qt-greeter

diff --git a/tests/test-login-qt-wrong-password b/tests/test-login-qt-wrong-password
deleted file mode 100755 (executable)
index 163ada2..0000000
--- a/tests/test-login-qt-wrong-password
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-./src/dbus-env ./src/test-runner login-wrong-password test-qt-greeter

diff --git a/tests/test-login-qt4 b/tests/test-login-qt4
new file mode 100755 (executable)
index 0000000..8ce496a
--- /dev/null
+++ b/tests/test-login-qt4
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner login test-qt4-greeter

diff --git a/tests/test-login-qt4-guest b/tests/test-login-qt4-guest
new file mode 100755 (executable)
index 0000000..f7ccc48
--- /dev/null
+++ b/tests/test-login-qt4-guest
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner login-guest test-qt4-greeter

diff --git a/tests/test-login-qt4-guest-disabled b/tests/test-login-qt4-guest-disabled
new file mode 100755 (executable)
index 0000000..b793165
--- /dev/null
+++ b/tests/test-login-qt4-guest-disabled
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner login-guest-disabled test-qt4-greeter

diff --git a/tests/test-login-qt-guest-fail-setup-script b/tests/test-login-qt4-guest-fail-setup-script
similarity index 82%
rename from tests/test-login-qt-guest-fail-setup-script
rename to tests/test-login-qt4-guest-fail-setup-script
index 11f9f4b192e8aa1eca2ceebcf21c258f251956f6..a80ca9ac7ec76705b56e87093874171063b74c2c 100755 (executable)
--- a/tests/test-login-qt-guest-fail-setup-script
+++ b/tests/test-login-qt4-guest-fail-setup-script
@@ -1,2 +1,2 @@
 #!/bin/sh
-./src/dbus-env ./src/test-runner login-guest-fail-setup-script test-qt-greeter
+./src/dbus-env ./src/test-runner login-guest-fail-setup-script test-qt4-greeter

diff --git a/tests/test-login-qt4-guest-logout b/tests/test-login-qt4-guest-logout
new file mode 100755 (executable)
index 0000000..be3724f
--- /dev/null
+++ b/tests/test-login-qt4-guest-logout
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner login-guest-logout test-qt4-greeter

diff --git a/tests/test-login-qt-guest-no-setup-script b/tests/test-login-qt4-guest-no-setup-script
similarity index 84%
rename from tests/test-login-qt-guest-no-setup-script
rename to tests/test-login-qt4-guest-no-setup-script
index 0c64559b3db424243e62cf8d62d6f03e76dc6371..5a068c8cfa2df58ca11fa15d3ac2a07d39ab6b70 100755 (executable)
--- a/tests/test-login-qt-guest-no-setup-script
+++ b/tests/test-login-qt4-guest-no-setup-script
@@ -1,2 +1,2 @@
 #!/bin/sh
-./src/dbus-env ./src/test-runner login-guest-no-setup-script test-qt-greeter
+./src/dbus-env ./src/test-runner login-guest-no-setup-script test-qt4-greeter

diff --git a/tests/test-login-qt4-info-prompt b/tests/test-login-qt4-info-prompt
new file mode 100755 (executable)
index 0000000..8c212bc
--- /dev/null
+++ b/tests/test-login-qt4-info-prompt
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner login-info-prompt test-qt4-greeter

diff --git a/tests/test-login-qt4-invalid-session b/tests/test-login-qt4-invalid-session
new file mode 100755 (executable)
index 0000000..9fb97bc
--- /dev/null
+++ b/tests/test-login-qt4-invalid-session
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner login-invalid-session test-qt4-greeter

diff --git a/tests/test-login-qt4-invalid-user b/tests/test-login-qt4-invalid-user
new file mode 100755 (executable)
index 0000000..ab855ab
--- /dev/null
+++ b/tests/test-login-qt4-invalid-user
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner login-invalid-user test-qt4-greeter

diff --git a/tests/test-login-qt4-logout b/tests/test-login-qt4-logout
new file mode 100755 (executable)
index 0000000..010863e
--- /dev/null
+++ b/tests/test-login-qt4-logout
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner login-logout test-qt4-greeter

diff --git a/tests/test-login-qt4-long-password b/tests/test-login-qt4-long-password
new file mode 100755 (executable)
index 0000000..e55f88b
--- /dev/null
+++ b/tests/test-login-qt4-long-password
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner login-long-password test-qt4-greeter

diff --git a/tests/test-login-qt4-long-username b/tests/test-login-qt4-long-username
new file mode 100755 (executable)
index 0000000..0a294ef
--- /dev/null
+++ b/tests/test-login-qt4-long-username
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner login-long-username test-qt4-greeter

diff --git a/tests/test-login-qt4-manual b/tests/test-login-qt4-manual
new file mode 100755 (executable)
index 0000000..bd341af
--- /dev/null
+++ b/tests/test-login-qt4-manual
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner login-manual test-qt4-greeter

diff --git a/tests/test-login-qt-manual-previous-session b/tests/test-login-qt4-manual-previous-session
similarity index 82%
rename from tests/test-login-qt-manual-previous-session
rename to tests/test-login-qt4-manual-previous-session
index 0b8f4b9a7c195ae6a1ae47fc43039b45ed600ad7..c485520e5f9125b415b65466fd2295b13057aac5 100755 (executable)
--- a/tests/test-login-qt-manual-previous-session
+++ b/tests/test-login-qt4-manual-previous-session
@@ -1,2 +1,2 @@
 #!/bin/sh
-./src/dbus-env ./src/test-runner login-manual-previous-session test-qt-greeter
+./src/dbus-env ./src/test-runner login-manual-previous-session test-qt4-greeter

diff --git a/tests/test-login-qt-multi-info-prompt b/tests/test-login-qt4-multi-info-prompt
similarity index 88%
rename from tests/test-login-qt-multi-info-prompt
rename to tests/test-login-qt4-multi-info-prompt
index 3bd4120e5cc31d0eeac88522eb32aae128b82a62..b308a9d56d4f91d5d9b75ffdfd5cc6f51e0d6647 100755 (executable)
--- a/tests/test-login-qt-multi-info-prompt
+++ b/tests/test-login-qt4-multi-info-prompt
@@ -1,2 +1,2 @@
 #!/bin/sh
-./src/dbus-env ./src/test-runner login-multi-info-prompt test-qt-greeter
+./src/dbus-env ./src/test-runner login-multi-info-prompt test-qt4-greeter

diff --git a/tests/test-login-qt4-new-authtok b/tests/test-login-qt4-new-authtok
new file mode 100755 (executable)
index 0000000..35e8bb4
--- /dev/null
+++ b/tests/test-login-qt4-new-authtok
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner login-new-authtok test-qt4-greeter

diff --git a/tests/test-login-qt4-no-password b/tests/test-login-qt4-no-password
new file mode 100755 (executable)
index 0000000..62e3ccc
--- /dev/null
+++ b/tests/test-login-qt4-no-password
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner login-no-password test-qt4-greeter

diff --git a/tests/test-login-qt4-pick-session b/tests/test-login-qt4-pick-session
new file mode 100755 (executable)
index 0000000..fb3a286
--- /dev/null
+++ b/tests/test-login-qt4-pick-session
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner login-pick-session test-qt4-greeter

diff --git a/tests/test-login-qt4-previous-session b/tests/test-login-qt4-previous-session
new file mode 100755 (executable)
index 0000000..7ec67f0
--- /dev/null
+++ b/tests/test-login-qt4-previous-session
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner login-previous-session test-qt4-greeter

diff --git a/tests/test-login-qt4-remote-session b/tests/test-login-qt4-remote-session
new file mode 100755 (executable)
index 0000000..dc0d56e
--- /dev/null
+++ b/tests/test-login-qt4-remote-session
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner login-remote-session test-qt4-greeter

diff --git a/tests/test-login-qt4-two-factor b/tests/test-login-qt4-two-factor
new file mode 100755 (executable)
index 0000000..3897f8a
--- /dev/null
+++ b/tests/test-login-qt4-two-factor
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner login-two-factor test-qt4-greeter

diff --git a/tests/test-login-qt4-wrong-password b/tests/test-login-qt4-wrong-password
new file mode 100755 (executable)
index 0000000..cbbee04
--- /dev/null
+++ b/tests/test-login-qt4-wrong-password
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner login-wrong-password test-qt4-greeter

diff --git a/tests/test-login-qt5 b/tests/test-login-qt5
new file mode 100755 (executable)
index 0000000..e167c59
--- /dev/null
+++ b/tests/test-login-qt5
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner login test-qt5-greeter

diff --git a/tests/test-login-qt5-guest b/tests/test-login-qt5-guest
new file mode 100755 (executable)
index 0000000..c758793
--- /dev/null
+++ b/tests/test-login-qt5-guest
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner login-guest test-qt5-greeter

diff --git a/tests/test-login-qt5-guest-disabled b/tests/test-login-qt5-guest-disabled
new file mode 100755 (executable)
index 0000000..f904e73
--- /dev/null
+++ b/tests/test-login-qt5-guest-disabled
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner login-guest-disabled test-qt5-greeter

diff --git a/tests/test-login-qt5-guest-fail-setup-script b/tests/test-login-qt5-guest-fail-setup-script
new file mode 100755 (executable)
index 0000000..25b60f0
--- /dev/null
+++ b/tests/test-login-qt5-guest-fail-setup-script
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner login-guest-fail-setup-script test-qt5-greeter

diff --git a/tests/test-login-qt5-guest-logout b/tests/test-login-qt5-guest-logout
new file mode 100755 (executable)
index 0000000..7c8f0f9
--- /dev/null
+++ b/tests/test-login-qt5-guest-logout
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner login-guest-logout test-qt5-greeter

diff --git a/tests/test-login-qt5-guest-no-setup-script b/tests/test-login-qt5-guest-no-setup-script
new file mode 100755 (executable)
index 0000000..6098804
--- /dev/null
+++ b/tests/test-login-qt5-guest-no-setup-script
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner login-guest-no-setup-script test-qt5-greeter

diff --git a/tests/test-login-qt5-info-prompt b/tests/test-login-qt5-info-prompt
new file mode 100755 (executable)
index 0000000..fad826f
--- /dev/null
+++ b/tests/test-login-qt5-info-prompt
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner login-info-prompt test-qt5-greeter

diff --git a/tests/test-login-qt5-invalid-session b/tests/test-login-qt5-invalid-session
new file mode 100755 (executable)
index 0000000..82d4d02
--- /dev/null
+++ b/tests/test-login-qt5-invalid-session
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner login-invalid-session test-qt5-greeter

diff --git a/tests/test-login-qt5-invalid-user b/tests/test-login-qt5-invalid-user
new file mode 100755 (executable)
index 0000000..e1cc89f
--- /dev/null
+++ b/tests/test-login-qt5-invalid-user
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner login-invalid-user test-qt5-greeter

diff --git a/tests/test-login-qt5-logout b/tests/test-login-qt5-logout
new file mode 100755 (executable)
index 0000000..5088493
--- /dev/null
+++ b/tests/test-login-qt5-logout
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner login-logout test-qt5-greeter

diff --git a/tests/test-login-qt5-long-password b/tests/test-login-qt5-long-password
new file mode 100755 (executable)
index 0000000..cd6682e
--- /dev/null
+++ b/tests/test-login-qt5-long-password
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner login-long-password test-qt5-greeter

diff --git a/tests/test-login-qt5-long-username b/tests/test-login-qt5-long-username
new file mode 100755 (executable)
index 0000000..f70662d
--- /dev/null
+++ b/tests/test-login-qt5-long-username
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner login-long-username test-qt5-greeter

diff --git a/tests/test-login-qt5-manual b/tests/test-login-qt5-manual
new file mode 100755 (executable)
index 0000000..54e2752
--- /dev/null
+++ b/tests/test-login-qt5-manual
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner login-manual test-qt5-greeter

diff --git a/tests/test-login-qt5-manual-previous-session b/tests/test-login-qt5-manual-previous-session
new file mode 100755 (executable)
index 0000000..234a6d6
--- /dev/null
+++ b/tests/test-login-qt5-manual-previous-session
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner login-manual-previous-session test-qt5-greeter

diff --git a/tests/test-login-qt5-multi-info-prompt b/tests/test-login-qt5-multi-info-prompt
new file mode 100755 (executable)
index 0000000..122e174
--- /dev/null
+++ b/tests/test-login-qt5-multi-info-prompt
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner login-multi-info-prompt test-qt5-greeter

diff --git a/tests/test-login-qt5-new-authtok b/tests/test-login-qt5-new-authtok
new file mode 100755 (executable)
index 0000000..167b906
--- /dev/null
+++ b/tests/test-login-qt5-new-authtok
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner login-new-authtok test-qt5-greeter

diff --git a/tests/test-login-qt5-no-password b/tests/test-login-qt5-no-password
new file mode 100755 (executable)
index 0000000..bc6515f
--- /dev/null
+++ b/tests/test-login-qt5-no-password
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner login-no-password test-qt5-greeter

diff --git a/tests/test-login-qt5-pick-session b/tests/test-login-qt5-pick-session
new file mode 100755 (executable)
index 0000000..6d519dd
--- /dev/null
+++ b/tests/test-login-qt5-pick-session
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner login-pick-session test-qt5-greeter

diff --git a/tests/test-login-qt5-previous-session b/tests/test-login-qt5-previous-session
new file mode 100755 (executable)
index 0000000..ff475b3
--- /dev/null
+++ b/tests/test-login-qt5-previous-session
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner login-previous-session test-qt5-greeter

diff --git a/tests/test-login-qt5-remote-session b/tests/test-login-qt5-remote-session
new file mode 100755 (executable)
index 0000000..52f7a45
--- /dev/null
+++ b/tests/test-login-qt5-remote-session
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner login-remote-session test-qt5-greeter

diff --git a/tests/test-login-qt5-two-factor b/tests/test-login-qt5-two-factor
new file mode 100755 (executable)
index 0000000..4531619
--- /dev/null
+++ b/tests/test-login-qt5-two-factor
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner login-two-factor test-qt5-greeter

diff --git a/tests/test-login-qt5-wrong-password b/tests/test-login-qt5-wrong-password
new file mode 100755 (executable)
index 0000000..18a376e
--- /dev/null
+++ b/tests/test-login-qt5-wrong-password
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner login-wrong-password test-qt5-greeter