Author: stephan
Date: 2008-04-10 22:46:48 +0000 (Thu, 10 Apr 2008)
New Revision: 26818
Added:
xfconf/trunk/tests/lock-properties/
xfconf/trunk/tests/test-template.sh.in
Removed:
xfconf/trunk/tests/get-properties/test-template.sh.in
xfconf/trunk/tests/has-properties/test-template.sh.in
xfconf/trunk/tests/property-changed-signal/test-template.sh.in
xfconf/trunk/tests/remove-properties/test-template.sh.in
xfconf/trunk/tests/set-properties/test-template.sh.in
Modified:
xfconf/trunk/configure.ac.in
xfconf/trunk/po/xfconf.pot
xfconf/trunk/tests/Makefile.am
xfconf/trunk/tests/get-properties/Makefile.am
xfconf/trunk/tests/has-properties/Makefile.am
xfconf/trunk/tests/property-changed-signal/Makefile.am
xfconf/trunk/tests/remove-properties/Makefile.am
xfconf/trunk/tests/set-properties/Makefile.am
Log:
Fix the test-suite
Modified: xfconf/trunk/configure.ac.in
===================================================================
--- xfconf/trunk/configure.ac.in 2008-04-10 22:19:14 UTC (rev 26817)
+++ xfconf/trunk/configure.ac.in 2008-04-10 22:46:48 UTC (rev 26818)
@@ -189,6 +189,11 @@
docs/spec/Makefile
po/Makefile.in
tests/Makefile
+tests/set-properties/Makefile
+tests/has-properties/Makefile
+tests/get-properties/Makefile
+tests/remove-properties/Makefile
+tests/property-changed-signal/Makefile
xfconf/Makefile
xfconf/libxfconf-0.pc
xfconf-gtk/Makefile
Modified: xfconf/trunk/po/xfconf.pot
===================================================================
--- xfconf/trunk/po/xfconf.pot 2008-04-10 22:19:14 UTC (rev 26817)
+++ xfconf/trunk/po/xfconf.pot 2008-04-10 22:46:48 UTC (rev 26818)
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-09 22:32+0200\n"
+"POT-Creation-Date: 2008-04-11 00:33+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <[EMAIL PROTECTED]>\n"
"Language-Team: LANGUAGE <[EMAIL PROTECTED]>\n"
@@ -17,11 +17,11 @@
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: common/xfconf-gvaluefuncs.c:222
+#: common/xfconf-gvaluefuncs.c:208
msgid "true"
msgstr ""
-#: common/xfconf-gvaluefuncs.c:223
+#: common/xfconf-gvaluefuncs.c:209
msgid "false"
msgstr ""
Modified: xfconf/trunk/tests/Makefile.am
===================================================================
--- xfconf/trunk/tests/Makefile.am 2008-04-10 22:19:14 UTC (rev 26817)
+++ xfconf/trunk/tests/Makefile.am 2008-04-10 22:46:48 UTC (rev 26818)
@@ -11,4 +11,5 @@
EXTRA_DIST = \
$(test_scripts) \
+ test-template.sh.in \
tests-common.h
Modified: xfconf/trunk/tests/get-properties/Makefile.am
===================================================================
--- xfconf/trunk/tests/get-properties/Makefile.am 2008-04-10 22:19:14 UTC
(rev 26817)
+++ xfconf/trunk/tests/get-properties/Makefile.am 2008-04-10 22:46:48 UTC
(rev 26818)
@@ -23,7 +23,7 @@
AM_CFLAGS = \
-DXFCONFD=\"$(top_builddir)/xfconfd/xfconfd\" \
-I$(top_srcdir) \
- -I$(top_builddir)/tests \
+ -I$(top_srcdir)/tests \
$(GLIB_CFLAGS)
LIBS = \
@@ -37,13 +37,12 @@
t_get_boolean_SOURCES = t-get-boolean.c
t_get_stringlist_SOURCES = t-get-stringlist.c
-%.sh: test-template.sh.in Makefile
- sed -e 's/@TEST_NAME@/$@/; s/\.sh//;' <$(srcdir)/test-template.sh.in >$@
+%.sh: $(top_srcdir)/tests/test-template.sh.in Makefile
+ sed -e 's/@TEST_NAME@/$@/; s/\.sh//;'
<$(top_srcdir)/tests/test-template.sh.in >$@
chmod 755 $@
clean-local:
rm -f t-get-*.sh
EXTRA_DIST = \
- $(test_scripts) \
- test-template.sh.in
+ $(test_scripts)
Deleted: xfconf/trunk/tests/get-properties/test-template.sh.in
Modified: xfconf/trunk/tests/has-properties/Makefile.am
===================================================================
--- xfconf/trunk/tests/has-properties/Makefile.am 2008-04-10 22:19:14 UTC
(rev 26817)
+++ xfconf/trunk/tests/has-properties/Makefile.am 2008-04-10 22:46:48 UTC
(rev 26818)
@@ -23,7 +23,7 @@
AM_CFLAGS = \
-DXFCONFD=\"$(top_builddir)/xfconfd/xfconfd\" \
-I$(top_srcdir) \
- -I$(top_builddir)/tests \
+ -I$(top_srcdir)/tests \
$(GLIB_CFLAGS)
LIBS = \
@@ -37,13 +37,12 @@
t_has_boolean_SOURCES = t-has-boolean.c
t_has_stringlist_SOURCES = t-has-stringlist.c
-%.sh: test-template.sh.in Makefile
- sed -e 's/@TEST_NAME@/$@/; s/\.sh//;' <$(srcdir)/test-template.sh.in >$@
+%.sh: $(top_srcdir)/tests/test-template.sh.in Makefile
+ sed -e 's/@TEST_NAME@/$@/; s/\.sh//;'
<$(top_srcdir)/tests/test-template.sh.in >$@
chmod 755 $@
clean-local:
rm -f t-has-*.sh
EXTRA_DIST = \
- $(test_scripts) \
- test-template.sh.in
+ $(test_scripts)
Deleted: xfconf/trunk/tests/has-properties/test-template.sh.in
Modified: xfconf/trunk/tests/property-changed-signal/Makefile.am
===================================================================
--- xfconf/trunk/tests/property-changed-signal/Makefile.am 2008-04-10
22:19:14 UTC (rev 26817)
+++ xfconf/trunk/tests/property-changed-signal/Makefile.am 2008-04-10
22:46:48 UTC (rev 26818)
@@ -11,7 +11,7 @@
AM_CFLAGS = \
-DXFCONFD=\"$(top_builddir)/xfconfd/xfconfd\" \
-I$(top_srcdir) \
- -I$(top_builddir)/tests \
+ -I$(top_srcdir)/tests \
$(GLIB_CFLAGS)
LIBS = \
@@ -19,13 +19,12 @@
t_string_changed_signal_SOURCES = t-string-changed-signal.c
-%.sh: test-template.sh.in Makefile
- sed -e 's/@TEST_NAME@/$@/; s/\.sh//;' <$(srcdir)/test-template.sh.in >$@
+%.sh: $(top_srcdir)/tests/test-template.sh.in Makefile
+ sed -e 's/@TEST_NAME@/$@/; s/\.sh//;'
<$(top_srcdir)/tests/test-template.sh.in >$@
chmod 755 $@
clean-local:
rm -f t-*-changed-signal.sh
EXTRA_DIST = \
- $(test_scripts) \
- test-template.sh.in
+ $(test_scripts)
Deleted: xfconf/trunk/tests/property-changed-signal/test-template.sh.in
Modified: xfconf/trunk/tests/remove-properties/Makefile.am
===================================================================
--- xfconf/trunk/tests/remove-properties/Makefile.am 2008-04-10 22:19:14 UTC
(rev 26817)
+++ xfconf/trunk/tests/remove-properties/Makefile.am 2008-04-10 22:46:48 UTC
(rev 26818)
@@ -23,7 +23,7 @@
AM_CFLAGS = \
-DXFCONFD=\"$(top_builddir)/xfconfd/xfconfd\" \
-I$(top_srcdir) \
- -I$(top_builddir)/tests \
+ -I$(top_srcdir)/tests \
$(GLIB_CFLAGS)
LIBS = \
@@ -37,13 +37,12 @@
t_remove_boolean_SOURCES = t-remove-boolean.c
t_remove_stringlist_SOURCES = t-remove-stringlist.c
-%.sh: test-template.sh.in Makefile
- sed -e 's/@TEST_NAME@/$@/; s/\.sh//;' <$(srcdir)/test-template.sh.in >$@
+%.sh: $(top_srcdir)/tests/test-template.sh.in Makefile
+ sed -e 's/@TEST_NAME@/$@/; s/\.sh//;'
<$(top_srcdir)/tests/test-template.sh.in >$@
chmod 755 $@
clean-local:
rm -f t-remove-*.sh
EXTRA_DIST = \
- $(test_scripts) \
- test-template.sh.in
+ $(test_scripts)
Deleted: xfconf/trunk/tests/remove-properties/test-template.sh.in
Modified: xfconf/trunk/tests/set-properties/Makefile.am
===================================================================
--- xfconf/trunk/tests/set-properties/Makefile.am 2008-04-10 22:19:14 UTC
(rev 26817)
+++ xfconf/trunk/tests/set-properties/Makefile.am 2008-04-10 22:46:48 UTC
(rev 26818)
@@ -23,7 +23,7 @@
AM_CFLAGS = \
-DXFCONFD=\"$(top_builddir)/xfconfd/xfconfd\" \
-I$(top_srcdir) \
- -I$(top_builddir)/tests \
+ -I$(top_srcdir)/tests \
$(GLIB_CFLAGS)
LIBS = \
@@ -37,13 +37,12 @@
t_set_boolean_SOURCES = t-set-boolean.c
t_set_stringlist_SOURCES = t-set-stringlist.c
-%.sh: test-template.sh.in Makefile
- sed -e 's/@TEST_NAME@/$@/; s/\.sh//;' <$(srcdir)/test-template.sh.in >$@
+%.sh: $(top_srcdir)/tests/test-template.sh.in Makefile
+ sed -e 's/@TEST_NAME@/$@/; s/\.sh//;'
<$(top_srcdir)/tests/test-template.sh.in >$@
chmod 755 $@
clean-local:
rm -f t-set-*.sh
EXTRA_DIST = \
- $(test_scripts) \
- test-template.sh.in
+ $(test_scripts)
Deleted: xfconf/trunk/tests/set-properties/test-template.sh.in
Added: xfconf/trunk/tests/test-template.sh.in
===================================================================
--- xfconf/trunk/tests/test-template.sh.in (rev 0)
+++ xfconf/trunk/tests/test-template.sh.in 2008-04-10 22:46:48 UTC (rev
26818)
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+eval `dbus-launch --sh-syntax`
+export DBUS_SESSION_BUS_ADDRESS
+export DBUS_SESSION_BUS_PID
+
+export XDG_CONFIG_HOME="../test-xdg_config_home"
+export XDG_CONFIG_DIRS=""
+
+./@TEST_NAME@
+ret=$?
+
+kill -TERM $DBUS_SESSION_BUS_PID
+
+exit $ret
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
