Merge lp:~kamstrup/dee/test-fixes into lp:dee

[Mikkel Kamstrup Erlandsen]

Add a headless mode for the test suite. It is disabled by default, and can be enabled with --enable-headless-tests.

[Mikkel Kamstrup Erlandsen (kamstrup)]

Rejected as this change is not necessary for Dee because it uses dbus-test-runner

review: Disapprove

Unmerged revisions

309. By Mikkel Kamstrup Erlandsen on 2011-11-29

Add a headless mode for the test suite. It is disabled by default, and can be enabled with --enable-headless-tests.

=== modified file 'configure.ac'
--- configure.ac	2011-11-19 22:20:23 +0000
+++ configure.ac	2011-11-29 09:43:24 +0000
@@ -141,6 +141,18 @@
 
 AM_CONDITIONAL(ENABLE_TRACE_LOG, test "$enable_trace_log" = "yes")
 
+dnl Headless tests ============================================================
+AC_ARG_ENABLE([headless-tests],
+              AS_HELP_STRING([--enable-headless-tests=@<:@no/yes@:>@],[enable headless test suite (requires Xvfb) @<:@default=no@:>@]),,
+              [enable_headless_tests=no])
+
+AM_CONDITIONAL([ENABLE_HEADLESS_TESTS],[test "x$enable_headless_tests" != "xno"])
+
+if test "x$enable_headless_tests" = "xyes"; then
+  AC_PATH_PROG([XVFB],[Xvfb])
+  AC_PATH_PROG([DBUS_LAUNCH],[dbus-launch])
+fi
+
 dnl ===========================================================================
 
 AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums)
@@ -185,6 +197,7 @@
 
   Tests          : ${enable_tests}
   Extended Tests : ${enable_extended_tests}
+  Headless tests : ${enable_headless_tests}
   Verbose logging: ${enable_trace_log}
 
   Extra CFlags   : ${CPPFLAGS} $MAINTAINER_CFLAGS
 
=== modified file 'tests/Makefile.am'
--- tests/Makefile.am	2011-08-31 19:29:04 +0000
+++ tests/Makefile.am	2011-11-29 09:43:24 +0000
@@ -122,8 +122,39 @@
 	      > test-dee-results.html ) \
 	  && ( xdg-open test-dee-results.html )
 
-#run make test as part of make check
+# Run tests as part of make check
+if ENABLE_HEADLESS_TESTS
+check-local: test-headless
+else
 check-local: test
+endif
 
 clean-generic:
 	rm -rf test-dee-results.xml test-dee-results.html dee-test-resource-manager
+
+# START HEADLESS TESTS
+if ENABLE_HEADLESS_TESTS
+DISPLAY = :27
+LOG_PATH = headless-logs
+test-headless:
+	set -e; \
+	export DISPLAY=$(DISPLAY); \
+	rm -rf $(LOG_PATH); \
+	mkdir $(LOG_PATH); \
+	$(XVFB) $(DISPLAY) -screen 0 1024x768x8 > $(LOG_PATH)/Xvfb.out 2>&1 & \
+	sleep 1; \
+	\
+	$(DBUS_LAUNCH) > $(LOG_PATH)/sessionbus.sh; \
+	source $(LOG_PATH)/sessionbus.sh; \
+	sleep 1; \
+	\
+	make test; \
+	sleep 1; \
+	\
+	kill `grep DBUS_SESSION_BUS_PID $(LOG_PATH)/sessionbus.sh | grep -oE '[0-9]+'`; \
+	pkill Xvfb;
+	
+endif
+# END HEADLESS TESTS
+
+