diff options
83 files changed, 322 insertions, 130 deletions
@@ -36,13 +36,13 @@ doc/*.txt doc/xml greeters/gtk/lightdm-gtk-greeter greeters/qt/lightdm-qt-greeter -greeters/qt/*_moc.cpp +greeters/qt/*_moc*.cpp greeters/qt/ui_*.h liblightdm-gobject/*.gir liblightdm-gobject/*.typelib liblightdm-gobject/liblightdm-gobject-1.pc liblightdm-qt/liblightdm-qt-2.pc -liblightdm-qt/*_moc.cpp +liblightdm-qt/*_moc*.cpp m4/* po/*.gmo po/POTFILES @@ -56,7 +56,7 @@ src/ldm-marshal.h src/lightdm src/lightdm-guest-session-wrapper tests/data/passwd -tests/src/*_moc.cpp +tests/src/*_moc*.cpp tests/src/dbus-env tests/src/guest-account tests/src/initctl diff --git a/Makefile.am b/Makefile.am index 484a8f4d..467d5c6f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,9 +2,7 @@ SUBDIRS = if COMPILE_LIBLIGHTDM_GOBJECT SUBDIRS += liblightdm-gobject endif -if COMPILE_LIBLIGHTDM_QT SUBDIRS += liblightdm-qt -endif if COMPILE_TESTS SUBDIRS += tests endif @@ -1,5 +1,6 @@ Overview of changes in lightdm 1.6.0 + * QLightDM: Add Qt5 version of the library: liblightdm-qt5-2 * QLightDM: Add some missing role names in UsersModel Overview of changes in lightdm 1.5.0 diff --git a/configure.ac b/configure.ac index a521c249..45133752 100644 --- a/configure.ac +++ b/configure.ac @@ -77,28 +77,54 @@ fi AM_CONDITIONAL(COMPILE_LIBLIGHTDM_GOBJECT, test x"$compile_liblightdm_gobject" != "xno") AC_ARG_ENABLE(liblightdm-qt, - AS_HELP_STRING([--enable-liblightdm-qt],[Enable LightDM client QT libraries [[default=auto]]]), - [enable_liblightdm_qt=$enableval], - [enable_liblightdm_qt="auto"]) -compile_liblightdm_qt=no -if test x"$enable_liblightdm_qt" = "xauto"; then - PKG_CHECK_MODULES(LIBLIGHTDM_QT, [ + AS_HELP_STRING([--enable-liblightdm-qt],[Enable LightDM client Qt4 libraries [[default=auto]]]), + [enable_liblightdm_qt4=$enableval], + [enable_liblightdm_qt4="auto"]) +compile_liblightdm_qt4=no +if test x"$enable_liblightdm_qt4" != "xno"; then + PKG_CHECK_MODULES(LIBLIGHTDM_QT4, [ QtCore QtDBus QtGui - ], compile_liblightdm_qt=yes, compile_liblightdm_qt=no) - QT4_BINDIR=`$PKG_CONFIG Qt --variable bindir` - AC_CHECK_TOOLS(MOC, [moc-qt4 moc],, [$QT4_BINDIR:$PATH]) -elif test x"$enable_liblightdm_qt" = "xyes"; then - PKG_CHECK_MODULES(LIBLIGHTDM_QT, [ - QtCore - QtDBus + ], + [compile_liblightdm_qt4=yes + AC_CHECK_TOOLS(MOC4, [moc-qt4 moc]) + if test x"$(readlink $(which $MOC4))" = xqtchooser; then + MOC4="$MOC4 --qt=qt4" + fi + ], + [if test "x$enable_liblightdm_qt4" != xauto; then + AC_MSG_FAILURE( + [--enable-liblightdm-qt was given, but test for Qt4 failed]) + fi + ]) +fi +AM_CONDITIONAL(COMPILE_LIBLIGHTDM_QT4, test x"$compile_liblightdm_qt4" != "xno") + +AC_ARG_ENABLE(liblightdm-qt5, + AS_HELP_STRING([--enable-liblightdm-qt5],[Enable LightDM client Qt5 libraries [[default=auto]]]), + [enable_liblightdm_qt5=$enableval], + [enable_liblightdm_qt5="auto"]) +compile_liblightdm_qt5=no +if test x"$enable_liblightdm_qt5" != "xno"; then + PKG_CHECK_MODULES(LIBLIGHTDM_QT5, [ + Qt5Core + Qt5DBus + Qt5Gui + ], + [compile_liblightdm_qt5=yes + AC_CHECK_TOOLS(MOC5, [moc]) + if test x"$(readlink $(which $MOC5))" = xqtchooser; then + MOC5="$MOC5 --qt=qt5" + fi + ], + [if test "x$enable_liblightdm_qt5" != xauto; then + AC_MSG_FAILURE( + [--enable-liblightdm-qt5 was given, but test for Qt5 failed]) + fi ]) - QT4_BINDIR=`$PKG_CONFIG Qt --variable bindir` - AC_CHECK_TOOLS(MOC, [moc-qt4 moc],, [$QT4_BINDIR:$PATH]) - compile_liblightdm_qt=yes fi -AM_CONDITIONAL(COMPILE_LIBLIGHTDM_QT, test x"$compile_liblightdm_qt" != "xno") +AM_CONDITIONAL(COMPILE_LIBLIGHTDM_QT5, test x"$compile_liblightdm_qt5" != "xno") AC_MSG_CHECKING(whether to build tests) AC_ARG_ENABLE(tests, @@ -174,6 +200,7 @@ liblightdm-gobject/liblightdm-gobject-1.pc liblightdm-gobject/Makefile liblightdm-qt/Makefile liblightdm-qt/liblightdm-qt-2.pc +liblightdm-qt/liblightdm-qt5-2.pc po/Makefile.in src/Makefile tests/Makefile @@ -196,6 +223,7 @@ echo " User session: $USER_SESSION liblightdm-gobject: $compile_liblightdm_gobject GObject introspection: $found_introspection - liblightdm-qt: $compile_liblightdm_qt + liblightdm-qt: $compile_liblightdm_qt4 + liblightdm-qt5: $compile_liblightdm_qt5 Enable tests: $enable_tests " diff --git a/liblightdm-qt/Makefile.am b/liblightdm-qt/Makefile.am index 865637f2..d16cf966 100644 --- a/liblightdm-qt/Makefile.am +++ b/liblightdm-qt/Makefile.am @@ -1,24 +1,33 @@ -lib_LTLIBRARIES = liblightdm-qt-2.la +%_moc4.cpp: QLightDM/%.h + $(MOC4) $< -o $@ -%_moc.cpp: QLightDM/%.h - $(MOC) $< -o $@ +%_moc5.cpp: QLightDM/%.h + $(MOC5) $< -o $@ -power.cpp: power_moc.cpp -greeter.cpp: greeter_moc.cpp -sessionsmodel.cpp: sessionsmodel_moc.cpp -usersmodel.cpp: usersmodel_moc.cpp - -liblightdm_qt_2_la_LIBADD = \ - $(LIBLIGHTDM_QT_LIBS) \ +common_libadd = \ -L$(top_builddir)/liblightdm-gobject \ -llightdm-gobject-1 +liblightdm_qt_2_la_LIBADD = \ + $(LIBLIGHTDM_QT4_LIBS) \ + $(common_libadd) +liblightdm_qt5_2_la_LIBADD = \ + $(LIBLIGHTDM_QT5_LIBS) \ + $(common_libadd) -liblightdm_qt_2_la_CXXFLAGS = $(LIBLIGHTDM_QT_CFLAGS) \ +common_cflags = \ -I$(top_srcdir)/liblightdm-gobject \ $(LIBLIGHTDM_GOBJECT_CFLAGS) \ -DXSESSIONS_DIR=\"$(datadir)/xsessions\" +liblightdm_qt_2_la_CXXFLAGS = \ + $(LIBLIGHTDM_QT4_CFLAGS) \ + $(common_cflags) +liblightdm_qt5_2_la_CXXFLAGS = \ + -fPIC \ + -DQT_DISABLE_DEPRECATED_BEFORE="QT_VERSION_CHECK(4, 0, 0)" \ + $(LIBLIGHTDM_QT5_CFLAGS) \ + $(common_cflags) -liblightdm_qt_2include_HEADERS = \ +common_headers = \ QLightDM/Greeter \ QLightDM/Power \ QLightDM/SessionsModel \ @@ -29,20 +38,43 @@ liblightdm_qt_2include_HEADERS = \ QLightDM/usersmodel.h liblightdm_qt_2includedir=$(includedir)/lightdm-qt-2/QLightDM +liblightdm_qt5_2includedir=$(includedir)/lightdm-qt5-2/QLightDM -liblightdm_qt_2_la_SOURCES = \ +common_sources = \ greeter.cpp \ power.cpp \ sessionsmodel.cpp \ - usersmodel.cpp \ + usersmodel.cpp +liblightdm_qt_2_la_SOURCES = \ + $(common_sources) \ $(liblightdm_qt_2include_HEADERS) +liblightdm_qt5_2_la_SOURCES = \ + $(common_sources) \ + $(liblightdm_qt5_2include_HEADERS) pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = liblightdm-qt-2.pc CLEANFILES = \ - *_moc.cpp + *_moc*.cpp DISTCLEANFILES = \ Makefile.in \ $(pkgconfig_DATA) + +lib_LTLIBRARIES = +BUILT_SOURCES = +pkgconfig_DATA = + +if COMPILE_LIBLIGHTDM_QT4 +lib_LTLIBRARIES += liblightdm-qt-2.la +liblightdm_qt_2include_HEADERS = $(common_headers) +BUILT_SOURCES += $(common_sources:.cpp=_moc4.cpp) +pkgconfig_DATA += liblightdm-qt-2.pc +endif + +if COMPILE_LIBLIGHTDM_QT5 +lib_LTLIBRARIES += liblightdm-qt5-2.la +liblightdm_qt5_2include_HEADERS = $(common_headers) +BUILT_SOURCES += $(common_sources:.cpp=_moc5.cpp) +pkgconfig_DATA += liblightdm-qt5-2.pc +endif diff --git a/liblightdm-qt/greeter.cpp b/liblightdm-qt/greeter.cpp index ff7841e0..8fb287ff 100644 --- a/liblightdm-qt/greeter.cpp +++ b/liblightdm-qt/greeter.cpp @@ -252,4 +252,8 @@ QString Greeter::hostname() const return QString::fromUtf8(lightdm_get_hostname()); } -#include "greeter_moc.cpp" +#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) +#include "greeter_moc5.cpp" +#else +#include "greeter_moc4.cpp" +#endif diff --git a/liblightdm-qt/liblightdm-qt-2.pc.in b/liblightdm-qt/liblightdm-qt-2.pc.in index 2991bb2b..1217afd9 100644 --- a/liblightdm-qt/liblightdm-qt-2.pc.in +++ b/liblightdm-qt/liblightdm-qt-2.pc.in @@ -4,7 +4,7 @@ libdir=@libdir@ includedir=@includedir@ Name: liblightdm-qt -Description: LightDM client library +Description: LightDM Qt4 client library Version: @VERSION@ Requires: QtCore QtGui Libs: -L${libdir} -llightdm-qt-2 diff --git a/liblightdm-qt/liblightdm-qt5-2.pc.in b/liblightdm-qt/liblightdm-qt5-2.pc.in new file mode 100644 index 00000000..bebeb5f8 --- /dev/null +++ b/liblightdm-qt/liblightdm-qt5-2.pc.in @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: liblightdm-qt5 +Description: LightDM Qt5 client library +Version: @VERSION@ +Requires: Qt5Core Qt5Gui +Libs: -L${libdir} -llightdm-qt5-2 +Cflags: -I${includedir}/lightdm-qt5-2 diff --git a/liblightdm-qt/power.cpp b/liblightdm-qt/power.cpp index e6a449b7..3df5cbd5 100644 --- a/liblightdm-qt/power.cpp +++ b/liblightdm-qt/power.cpp @@ -110,4 +110,8 @@ void PowerInterface::restart() d->consoleKitInterface->call("Restart"); } -#include "power_moc.cpp" +#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) +#include "power_moc5.cpp" +#else +#include "power_moc4.cpp" +#endif diff --git a/liblightdm-qt/sessionsmodel.cpp b/liblightdm-qt/sessionsmodel.cpp index 1fed7f43..9ad335f9 100644 --- a/liblightdm-qt/sessionsmodel.cpp +++ b/liblightdm-qt/sessionsmodel.cpp @@ -146,4 +146,8 @@ QVariant SessionsModel::data(const QModelIndex &index, int role) const return QVariant(); } -#include "sessionsmodel_moc.cpp" +#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) +#include "sessionsmodel_moc5.cpp" +#else +#include "sessionsmodel_moc4.cpp" +#endif diff --git a/liblightdm-qt/usersmodel.cpp b/liblightdm-qt/usersmodel.cpp index 8bb09a5b..91f67671 100644 --- a/liblightdm-qt/usersmodel.cpp +++ b/liblightdm-qt/usersmodel.cpp @@ -243,4 +243,8 @@ QVariant UsersModel::data(const QModelIndex &index, int role) const } -#include "usersmodel_moc.cpp" +#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) +#include "usersmodel_moc5.cpp" +#else +#include "usersmodel_moc4.cpp" +#endif diff --git a/tests/Makefile.am b/tests/Makefile.am index bba50272..33965f9a 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -131,32 +131,60 @@ TESTS = \ # test-qt-change-password # test-autologin-create-directory -if COMPILE_LIBLIGHTDM_QT +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 index 64870e6d..00000000 --- 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 index 00000000..ec8a6508 --- /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 index 00000000..7a322218 --- /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 34c48969..46011cbf 100644 --- a/tests/src/Makefile.am +++ b/tests/src/Makefile.am @@ -14,8 +14,12 @@ libsystem_la_LIBADD = -ldl $(GLIB_LIBS) # but produces a shared library (instead of just a static library) libsystem_la_LDFLAGS = -rpath /nowhere -if COMPILE_LIBLIGHTDM_QT -noinst_PROGRAMS += test-qt-greeter +if COMPILE_LIBLIGHTDM_QT4 +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_QT_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_QT_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 index d26e0444..00000000 --- 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 index ba71d6b0..07657c0e 100755 --- 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 index 00000000..3b928c48 --- /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 index 00000000..7e88255a --- /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 index 00000000..bb66b715 --- /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 index 9de979ea..00000000 --- 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 index 6dd477a5..00000000 --- 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 index b436fcd5..00000000 --- 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 index 9ab72801..00000000 --- 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 index 29df4699..00000000 --- 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 index 00d60221..00000000 --- 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 index 09a39d4d..00000000 --- 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 index a42b8857..00000000 --- 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 index 9a0aaa7e..00000000 --- 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 index e0219b86..00000000 --- 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 index db61be5e..00000000 --- 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 index 7ce6b578..00000000 --- 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 index e699225c..00000000 --- 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 index 1628f5a9..00000000 --- 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 index 0ba8bfdc..00000000 --- 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 index 427afe47..00000000 --- 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 index 04612915..00000000 --- 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 index 163ada20..00000000 --- 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 index 00000000..8ce496a5 --- /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 index 00000000..f7ccc487 --- /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 index 00000000..b7931654 --- /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 index 11f9f4b1..a80ca9ac 100755 --- 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 index 00000000..be3724fc --- /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 index 0c64559b..5a068c8c 100755 --- 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 index 00000000..8c212bca --- /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 index 00000000..9fb97bc3 --- /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 index 00000000..ab855abc --- /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 index 00000000..010863e5 --- /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 index 00000000..e55f88bc --- /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 index 00000000..0a294ef4 --- /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 index 00000000..bd341af8 --- /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 index 0b8f4b9a..c485520e 100755 --- 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 index 3bd4120e..b308a9d5 100755 --- 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 index 00000000..35e8bb47 --- /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 index 00000000..62e3ccc7 --- /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 index 00000000..fb3a286b --- /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 index 00000000..7ec67f0d --- /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 index 00000000..dc0d56ed --- /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 index 00000000..3897f8a0 --- /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 index 00000000..cbbee043 --- /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 index 00000000..e167c59b --- /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 index 00000000..c758793e --- /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 index 00000000..f904e731 --- /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 index 00000000..25b60f08 --- /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 index 00000000..7c8f0f95 --- /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 index 00000000..60988049 --- /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 index 00000000..fad826f5 --- /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 index 00000000..82d4d027 --- /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 index 00000000..e1cc89f0 --- /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 index 00000000..50884936 --- /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 index 00000000..cd6682ec --- /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 index 00000000..f70662d4 --- /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 index 00000000..54e27529 --- /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 index 00000000..234a6d65 --- /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 index 00000000..122e1748 --- /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 index 00000000..167b906f --- /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 index 00000000..bc6515fb --- /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 index 00000000..6d519ddc --- /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 index 00000000..ff475b30 --- /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 index 00000000..52f7a457 --- /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 index 00000000..45316194 --- /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 index 00000000..18a376ee --- /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 |