add qt5 tests in addition to qt4 tests

mikix · mikix · commit 7d87029699ba · 2013-02-06T09:53:36.000-05:00
diff --git 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
diff --git a/tests/data/xgreeters/test-qt4-greeter.desktop 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
@@ -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
@@ -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
diff --git a/tests/test-autologin-qt4-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
@@ -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
@@ -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
@@ -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
diff --git a/tests/test-login-qt-guest b/tests/test-login-qt-guest
diff --git a/tests/test-login-qt-guest-disabled b/tests/test-login-qt-guest-disabled
diff --git a/tests/test-login-qt-guest-logout b/tests/test-login-qt-guest-logout
diff --git a/tests/test-login-qt-info-prompt b/tests/test-login-qt-info-prompt
diff --git a/tests/test-login-qt-invalid-session b/tests/test-login-qt-invalid-session
diff --git a/tests/test-login-qt-invalid-user b/tests/test-login-qt-invalid-user
diff --git a/tests/test-login-qt-logout b/tests/test-login-qt-logout
diff --git a/tests/test-login-qt-long-password b/tests/test-login-qt-long-password
diff --git a/tests/test-login-qt-long-username b/tests/test-login-qt-long-username
diff --git a/tests/test-login-qt-manual b/tests/test-login-qt-manual
diff --git a/tests/test-login-qt-new-authtok b/tests/test-login-qt-new-authtok
diff --git a/tests/test-login-qt-no-password b/tests/test-login-qt-no-password
diff --git a/tests/test-login-qt-pick-session b/tests/test-login-qt-pick-session
diff --git a/tests/test-login-qt-previous-session b/tests/test-login-qt-previous-session
diff --git a/tests/test-login-qt-remote-session b/tests/test-login-qt-remote-session
diff --git a/tests/test-login-qt-two-factor b/tests/test-login-qt-two-factor
diff --git a/tests/test-login-qt-wrong-password b/tests/test-login-qt-wrong-password
diff --git a/tests/test-login-qt4 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
@@ -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
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner login-guest-disabled test-qt4-greeter
diff --git a/tests/test-login-qt4-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
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner login-guest-logout test-qt4-greeter
diff --git a/tests/test-login-qt4-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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner login-manual test-qt4-greeter
diff --git a/tests/test-login-qt4-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-qt4-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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner login-wrong-password test-qt5-greeter

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`#!/bin/sh`
`2`		`-./src/dbus-env ./src/test-runner autologin-guest-timeout test-qt-greeter`
	`2`	`+./src/dbus-env ./src/test-runner autologin-guest-timeout test-qt4-greeter`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+#!/bin/sh`
	`2`	`+./src/dbus-env ./src/test-runner autologin-timeout test-qt4-greeter`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+#!/bin/sh`
	`2`	`+./src/dbus-env ./src/test-runner login test-qt4-greeter`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`#!/bin/sh`
`2`		`-./src/dbus-env ./src/test-runner login-guest-fail-setup-script test-qt-greeter`
	`2`	`+./src/dbus-env ./src/test-runner login-guest-fail-setup-script test-qt4-greeter`