Merge lp:~kamstrup/bamf/fail-on-FAIL into lp:bamf/0.4

[Mikkel Kamstrup Erlandsen]

Bugfix:

 * Add missing guard checking if the legacy WnckWindow is != NULL in bamf_legacy_window_save_mini_icon(). This fixes the tests /Application/ManagesXid and /Application/Xids when running headless

Fixes for headless test mode:

 * Properly exit if any tests report errors during 'make check' when running in headless mode
 * Remove debug spew when running tests "Export path: %s\n"
 * Remove unused variable TEST_RESULTS from test Makefile.ams

[Jason Smith (jassmith)]

seems rather obvious on seeing it, well caught

review: Approve

[Mikkel Kamstrup Erlandsen (kamstrup)]

Just uploaded some more fixes that should fix the headless mode on the build bots:

 * Remove unused variable TEST_RESULTS from test Makefile.ams

 * Remove debug spew when running tests "Export path: %s\n"

 * Add missing guard checking if the legacy WnckWindow is != NULL in bamf_legacy_window_save_mini_icon(). This fixes the tests /Application/ManagesXid and /Application/Xids

Please re-review

[Didier Roche-Tolomelli (didrocks)]

Approving latest commit, looks good, let's test this :)

review: Approve

=== modified file 'src/bamf-legacy-window.c'
--- src/bamf-legacy-window.c	2011-09-26 11:44:10 +0000
+++ src/bamf-legacy-window.c	2011-11-29 08:12:24 +0000
@@ -215,6 +215,9 @@
   
   window = self->priv->legacy_window;
   
+  if (!window)
+    return NULL;
+  
   if (wnck_window_get_icon_is_fallback (window))
     return NULL;
   

=== modified file 'src/bamf-view.c'
--- src/bamf-view.c	2011-08-01 23:25:01 +0000
+++ src/bamf-view.c	2011-11-29 08:12:24 +0000
@@ -462,8 +462,6 @@
       path = g_strdup_printf ("%s/%s", BAMF_DBUS_PATH, stable_name);
       g_free (stable_name);
 
-      g_print ("Export Path: %s\n", path);
-
       BAMF_VIEW_GET_CLASS (view)->names = g_list_prepend (BAMF_VIEW_GET_CLASS (view)->names, path);
 
       view->priv->path = path;

=== modified file 'tests/bamfdaemon/Makefile.am'
--- tests/bamfdaemon/Makefile.am	2011-11-28 10:17:05 +0000
+++ tests/bamfdaemon/Makefile.am	2011-11-29 08:12:24 +0000
@@ -109,21 +109,21 @@
 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 & \
+	$(XVFB) $(DISPLAY) -screen 0 1024x768x8 > $(LOG_PATH)/Xvfb.out 2>&1 & \
 	sleep 1; \
 	\
-	$(DBUS_LAUNCH) > $(LOG_PATH)/_sessionbus.sh; \
-	source $(LOG_PATH)/_sessionbus.sh; \
+	$(DBUS_LAUNCH) > $(LOG_PATH)/sessionbus.sh; \
+	source $(LOG_PATH)/sessionbus.sh; \
 	sleep 1; \
 	\
 	make test; \
-	TEST_RESULTS=$?; \
 	sleep 1; \
 	\
-	kill `grep DBUS_SESSION_BUS_PID $(LOG_PATH)/_sessionbus.sh | grep -oE '[0-9]+'`; \
+	kill `grep DBUS_SESSION_BUS_PID $(LOG_PATH)/sessionbus.sh | grep -oE '[0-9]+'`; \
 	pkill Xvfb;
 	
 endif

=== modified file 'tests/libbamf/Makefile.am'
--- tests/libbamf/Makefile.am	2011-11-28 10:17:05 +0000
+++ tests/libbamf/Makefile.am	2011-11-29 08:12:24 +0000
@@ -65,21 +65,21 @@
 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 & \
+	$(XVFB) $(DISPLAY) -screen 0 1024x768x8 > $(LOG_PATH)/Xvfb.out 2>&1 & \
 	sleep 1; \
 	\
-	$(DBUS_LAUNCH) > $(LOG_PATH)/_sessionbus.sh; \
-	source $(LOG_PATH)/_sessionbus.sh; \
+	$(DBUS_LAUNCH) > $(LOG_PATH)/sessionbus.sh; \
+	source $(LOG_PATH)/sessionbus.sh; \
 	sleep 1; \
 	\
 	make test; \
-	TEST_RESULTS=$?; \
 	sleep 1; \
 	\
-	kill `grep DBUS_SESSION_BUS_PID $(LOG_PATH)/_sessionbus.sh | grep -oE '[0-9]+'`; \
+	kill `grep DBUS_SESSION_BUS_PID $(LOG_PATH)/sessionbus.sh | grep -oE '[0-9]+'`; \
 	pkill Xvfb;
 	
 endif