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

[From: subversion at stage.maemo.org]

Author: herzi
Date: 2009-02-27 17:16:58 +0200 (Fri, 27 Feb 2009)
New Revision: 17540

Modified:
   projects/haf/trunk/sapwood/ChangeLog
   projects/haf/trunk/sapwood/tests/Makefile.am
   projects/haf/trunk/sapwood/tests/sapwood-wrapper
Log:
2009-02-27  Sven Herzberg  <herzi at lanedo.com>

	Properly execute tests against the correct modules

	* tests/Makefile.am: also use the script from the demos folder
	* tests/sapwood-wrapper: point to the correct module


Modified: projects/haf/trunk/sapwood/ChangeLog
===================================================================
--- projects/haf/trunk/sapwood/ChangeLog	2009-02-27 15:16:53 UTC (rev 17539)
+++ projects/haf/trunk/sapwood/ChangeLog	2009-02-27 15:16:58 UTC (rev 17540)
@@ -1,3 +1,10 @@
+2009-02-27  Sven Herzberg  <herzi at lanedo.com>
+
+	Properly execute tests against the correct modules
+
+	* tests/Makefile.am: also use the script from the demos folder
+	* tests/sapwood-wrapper: point to the correct module
+
 2009-01-16  Sven Herzberg  <sven at imendio.com>
 
 	Comment out my hildon-specific hack in the server wrapper file

Modified: projects/haf/trunk/sapwood/tests/Makefile.am
===================================================================
--- projects/haf/trunk/sapwood/tests/Makefile.am	2009-02-27 15:16:53 UTC (rev 17539)
+++ projects/haf/trunk/sapwood/tests/Makefile.am	2009-02-27 15:16:58 UTC (rev 17540)
@@ -3,7 +3,7 @@
 AM_CPPFLAGS=-I$(top_srcdir)/protocol $(GTK_CFLAGS)
 LDADD=$(top_builddir)/engine/libsapwood-client.la
 
-TESTS_ENVIRONMENT=$(srcdir)/sapwood-wrapper
+TESTS_ENVIRONMENT=$(srcdir)/sapwood-wrapper $(top_srcdir)/demos/run-demo
 
 noinst_PROGRAMS = $(TEST_PROGS)
 

Modified: projects/haf/trunk/sapwood/tests/sapwood-wrapper
===================================================================
--- projects/haf/trunk/sapwood/tests/sapwood-wrapper	2009-02-27 15:16:53 UTC (rev 17539)
+++ projects/haf/trunk/sapwood/tests/sapwood-wrapper	2009-02-27 15:16:58 UTC (rev 17540)
@@ -1,7 +1,5 @@
 #!/bin/bash
-export GTK_PATH=/home/herzi/Hacking/Maemo/prefix/lib/gtk-2.0
-#export GTK2_RC_FILES=/home/herzi/Hacking/Maemo/prefix/share/themes/devel/gtk-2.0/gtkrc
-export SAPWOOD_SERVER_DEBUG=1
+#export SAPWOOD_SERVER_DEBUG=1
 
 if test $# -eq 0; then
         echo "Usage: $0 <command> [args]" >&2