[maemo-commits] [maemo-commits] r16276 - in projects/haf/trunk/sapwood: . tests

[From: subversion at stage.maemo.org]

Author: herzi
Date: 2008-09-29 16:54:18 +0300 (Mon, 29 Sep 2008)
New Revision: 16276

Modified:
   projects/haf/trunk/sapwood/ChangeLog
   projects/haf/trunk/sapwood/tests/double-free.c
   projects/haf/trunk/sapwood/tests/sapwood-wrapper
Log:
2008-09-29  Sven Herzberg  <sven at imendio.com>

	Support the regular xvfb "output" of the testing framework

	* tests/double-free.c (main),
	* tests/sapwood-wrapper: drop the DISPLAY=:0.0 hacks


Modified: projects/haf/trunk/sapwood/ChangeLog
===================================================================
--- projects/haf/trunk/sapwood/ChangeLog	2008-09-29 13:54:11 UTC (rev 16275)
+++ projects/haf/trunk/sapwood/ChangeLog	2008-09-29 13:54:18 UTC (rev 16276)
@@ -1,5 +1,12 @@
 2008-09-29  Sven Herzberg  <sven at imendio.com>
 
+	Support the regular xvfb "output" of the testing framework
+
+	* tests/double-free.c (main),
+	* tests/sapwood-wrapper: drop the DISPLAY=:0.0 hacks
+
+2008-09-29  Sven Herzberg  <sven at imendio.com>
+
 	Pass "make distcheck" again
 
 	* server/Makefile.am: fixed the include path for the protocol header

Modified: projects/haf/trunk/sapwood/tests/double-free.c
===================================================================
--- projects/haf/trunk/sapwood/tests/double-free.c	2008-09-29 13:54:11 UTC (rev 16275)
+++ projects/haf/trunk/sapwood/tests/double-free.c	2008-09-29 13:54:18 UTC (rev 16276)
@@ -248,9 +248,6 @@
 
   g_type_init ();
 
-  /* gtester disables this if it doesn't find xvfb */
-  g_setenv ("DISPLAY", ":0.0", TRUE);
-
   gdk_init (&argc, &argv);
 
   fd = pixbuf_proto_get_socket (&error);

Modified: projects/haf/trunk/sapwood/tests/sapwood-wrapper
===================================================================
--- projects/haf/trunk/sapwood/tests/sapwood-wrapper	2008-09-29 13:54:11 UTC (rev 16275)
+++ projects/haf/trunk/sapwood/tests/sapwood-wrapper	2008-09-29 13:54:18 UTC (rev 16276)
@@ -8,10 +8,12 @@
         return 1
 fi
 
-DISPLAY=:0 ../server/sapwood-server &
+echo $DISPLAY
+sleep 1 # wait for xvfb to be ready
+../server/sapwood-server &
 
 export $(grep ^top_srcdir Makefile | sed 's/ = /=/')
-sleep 1
+sleep 1 # wait for sapwood-server to be ready
 $@ || echo "$@: return value: $?"
 
 kill %- # %- : last job started : http://tldp.org/LDP/abs/html/x8885.html#JOBIDTABLE