[sapwood] support builddir!=srcdir
- From: Sven Herzberg <herzi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [sapwood] support builddir!=srcdir
- Date: Fri, 6 Aug 2010 12:04:33 +0000 (UTC)
commit afb72f581109e45b399e8b1e03c3e84127f68f0f
Author: Sven Herzberg <herzi gnome-de org>
Date: Wed Aug 4 14:02:51 2010 +0200
support builddir!=srcdir
* tests/Makefile.am,
* tests/large-window.gtkrc -> tests/large-window.gtkrc.in: renamed the
file for autogeneration
* tests/sapwood-wrapper: use a separate TMPDIR to avoid conflicts with
the user's session
tests/Makefile.am | 6 ++++++
.../{large-window.gtkrc => large-window.gtkrc.in} | 2 +-
tests/sapwood-wrapper | 3 +++
3 files changed, 10 insertions(+), 1 deletions(-)
---
diff --git a/tests/Makefile.am b/tests/Makefile.am
index b10ba08..e81cbb0 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -3,6 +3,12 @@ include $(top_srcdir)/Makefile.decl
AM_CPPFLAGS=-I$(top_srcdir)/protocol $(GTK_CFLAGS)
LDADD=$(top_builddir)/engine/libsapwood-client.la
+check: large-window.gtkrc
+CLEANFILES=large-window.gtkrc
+
+%.gtkrc: %.gtkrc.in
+ $(AM_V_GEN) sed 's|@TOP_SRCDIR@|$(top_srcdir)|' $< > $@
+
TESTS_ENVIRONMENT=$(srcdir)/sapwood-wrapper $(top_srcdir)/demos/run-demo
noinst_PROGRAMS = $(TEST_PROGS)
diff --git a/tests/large-window.gtkrc b/tests/large-window.gtkrc.in
similarity index 91%
rename from tests/large-window.gtkrc
rename to tests/large-window.gtkrc.in
index b51f11f..3245b11 100644
--- a/tests/large-window.gtkrc
+++ b/tests/large-window.gtkrc.in
@@ -1,7 +1,7 @@
# Copyright Nokia Corporation 2007
# Licensed under Creative Commons Attribution-ShareAlike 2.5 license
-pixmap_path "../demos/images"
+pixmap_path "@TOP_SRCDIR@/demos/images"
style "broken-textview"
{
diff --git a/tests/sapwood-wrapper b/tests/sapwood-wrapper
index 3361ecd..7eade67 100755
--- a/tests/sapwood-wrapper
+++ b/tests/sapwood-wrapper
@@ -1,6 +1,9 @@
#!/bin/bash
#export SAPWOOD_SERVER_DEBUG=1
+# set a new TMPDIR in order to not conflict with existing servers in the user's session
+export TMPDIR="`mktemp -d`"
+
if test $# -eq 0; then
echo "Usage: $0 <command> [args]" >&2
return 1
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]