Author: kelnos
Date: 2008-04-11 05:29:07 +0000 (Fri, 11 Apr 2008)
New Revision: 26823
Added:
xfconf/trunk/tests/Makefile.inc
Modified:
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
xfconf/trunk/tests/test-template.sh.in
Log:
pull common stuff out of makefiles, fix 'mke distcheck' properly
Copied: xfconf/trunk/tests/Makefile.inc (from rev 26818,
xfconf/trunk/tests/property-changed-signal/Makefile.am)
===================================================================
--- xfconf/trunk/tests/Makefile.inc (rev 0)
+++ xfconf/trunk/tests/Makefile.inc 2008-04-11 05:29:07 UTC (rev 26823)
@@ -0,0 +1,19 @@
+check_SCRIPTS = $(addsuffix .sh,$(check_PROGRAMS))
+
+TESTS = $(check_SCRIPTS)
+TESTS_ENVIRONMENT =
XDG_CONFIG_HOME="$(top_builddir)/tests/test-xdg_config_home"
+
+AM_CFLAGS = \
+ -DXFCONFD=\"$(top_builddir)/xfconfd/xfconfd\" \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/tests \
+ $(GLIB_CFLAGS)
+
+LIBS = \
+ $(top_builddir)/xfconf/libxfconf-$(LIBXFCONF_VERSION_API).la
+
+%.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 $@
+
+CLEANFILES = $(check_SCRIPTS)
Modified: xfconf/trunk/tests/get-properties/Makefile.am
===================================================================
--- xfconf/trunk/tests/get-properties/Makefile.am 2008-04-11 05:24:39 UTC
(rev 26822)
+++ xfconf/trunk/tests/get-properties/Makefile.am 2008-04-11 05:29:07 UTC
(rev 26823)
@@ -1,12 +1,3 @@
-test_scripts = \
- t-get-string.sh \
- t-get-int.sh \
- t-get-uint64.sh \
- t-get-double.sh \
- t-get-arrayv.sh \
- t-get-boolean.sh \
- t-get-stringlist.sh
-
check_PROGRAMS = \
t-get-string \
t-get-int \
@@ -16,19 +7,6 @@
t-get-boolean \
t-get-stringlist
-check_SCRIPTS = $(test_scripts)
-
-TESTS = $(test_scripts)
-
-AM_CFLAGS = \
- -DXFCONFD=\"$(top_builddir)/xfconfd/xfconfd\" \
- -I$(top_srcdir) \
- -I$(top_srcdir)/tests \
- $(GLIB_CFLAGS)
-
-LIBS = \
- $(top_builddir)/xfconf/libxfconf-$(LIBXFCONF_VERSION_API).la
-
t_get_string_SOURCES = t-get-string.c
t_get_int_SOURCES = t-get-int.c
t_get_uint64_SOURCES = t-get-uint64.c
@@ -37,12 +15,4 @@
t_get_boolean_SOURCES = t-get-boolean.c
t_get_stringlist_SOURCES = t-get-stringlist.c
-%.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)
+include $(top_srcdir)/tests/Makefile.inc
Modified: xfconf/trunk/tests/has-properties/Makefile.am
===================================================================
--- xfconf/trunk/tests/has-properties/Makefile.am 2008-04-11 05:24:39 UTC
(rev 26822)
+++ xfconf/trunk/tests/has-properties/Makefile.am 2008-04-11 05:29:07 UTC
(rev 26823)
@@ -1,12 +1,3 @@
-test_scripts = \
- t-has-string.sh \
- t-has-int.sh \
- t-has-uint64.sh \
- t-has-double.sh \
- t-has-arrayv.sh \
- t-has-boolean.sh \
- t-has-stringlist.sh
-
check_PROGRAMS = \
t-has-string \
t-has-int \
@@ -15,18 +6,6 @@
t-has-arrayv \
t-has-boolean \
t-has-stringlist
-
-check_SCRIPTS = $(test_scripts)
-
-TESTS = $(test_scripts)
-
-AM_CFLAGS = \
- -DXFCONFD=\"$(top_builddir)/xfconfd/xfconfd\" \
- -I$(top_srcdir) \
- -I$(top_srcdir)/tests \
- $(GLIB_CFLAGS)
-
-LIBS = \
$(top_builddir)/xfconf/libxfconf-$(LIBXFCONF_VERSION_API).la
t_has_string_SOURCES = t-has-string.c
@@ -37,12 +16,4 @@
t_has_boolean_SOURCES = t-has-boolean.c
t_has_stringlist_SOURCES = t-has-stringlist.c
-%.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)
+include $(top_srcdir)/tests/Makefile.inc
Modified: xfconf/trunk/tests/property-changed-signal/Makefile.am
===================================================================
--- xfconf/trunk/tests/property-changed-signal/Makefile.am 2008-04-11
05:24:39 UTC (rev 26822)
+++ xfconf/trunk/tests/property-changed-signal/Makefile.am 2008-04-11
05:29:07 UTC (rev 26823)
@@ -1,30 +1,6 @@
-test_scripts = \
- t-string-changed-signal.sh
-
check_PROGRAMS = \
t-string-changed-signal
-check_SCRIPTS = $(test_scripts)
-
-TESTS = $(test_scripts)
-
-AM_CFLAGS = \
- -DXFCONFD=\"$(top_builddir)/xfconfd/xfconfd\" \
- -I$(top_srcdir) \
- -I$(top_srcdir)/tests \
- $(GLIB_CFLAGS)
-
-LIBS = \
- $(top_builddir)/xfconf/libxfconf-$(LIBXFCONF_VERSION_API).la
-
t_string_changed_signal_SOURCES = t-string-changed-signal.c
-%.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)
+include $(top_srcdir)/tests/Makefile.inc
Modified: xfconf/trunk/tests/remove-properties/Makefile.am
===================================================================
--- xfconf/trunk/tests/remove-properties/Makefile.am 2008-04-11 05:24:39 UTC
(rev 26822)
+++ xfconf/trunk/tests/remove-properties/Makefile.am 2008-04-11 05:29:07 UTC
(rev 26823)
@@ -1,12 +1,3 @@
-test_scripts = \
- t-remove-string.sh \
- t-remove-int.sh \
- t-remove-uint64.sh \
- t-remove-double.sh \
- t-remove-arrayv.sh \
- t-remove-boolean.sh \
- t-remove-stringlist.sh
-
check_PROGRAMS = \
t-remove-string \
t-remove-int \
@@ -16,19 +7,6 @@
t-remove-boolean \
t-remove-stringlist
-check_SCRIPTS = $(test_scripts)
-
-TESTS = $(test_scripts)
-
-AM_CFLAGS = \
- -DXFCONFD=\"$(top_builddir)/xfconfd/xfconfd\" \
- -I$(top_srcdir) \
- -I$(top_srcdir)/tests \
- $(GLIB_CFLAGS)
-
-LIBS = \
- $(top_builddir)/xfconf/libxfconf-$(LIBXFCONF_VERSION_API).la
-
t_remove_string_SOURCES = t-remove-string.c
t_remove_int_SOURCES = t-remove-int.c
t_remove_uint64_SOURCES = t-remove-uint64.c
@@ -37,12 +15,4 @@
t_remove_boolean_SOURCES = t-remove-boolean.c
t_remove_stringlist_SOURCES = t-remove-stringlist.c
-%.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)
+include $(top_srcdir)/tests/Makefile.inc
Modified: xfconf/trunk/tests/set-properties/Makefile.am
===================================================================
--- xfconf/trunk/tests/set-properties/Makefile.am 2008-04-11 05:24:39 UTC
(rev 26822)
+++ xfconf/trunk/tests/set-properties/Makefile.am 2008-04-11 05:29:07 UTC
(rev 26823)
@@ -1,12 +1,3 @@
-test_scripts = \
- t-set-string.sh \
- t-set-int.sh \
- t-set-uint64.sh \
- t-set-double.sh \
- t-set-arrayv.sh \
- t-set-boolean.sh \
- t-set-stringlist.sh
-
check_PROGRAMS = \
t-set-string \
t-set-int \
@@ -16,19 +7,6 @@
t-set-boolean \
t-set-stringlist
-check_SCRIPTS = $(test_scripts)
-
-TESTS = $(test_scripts)
-
-AM_CFLAGS = \
- -DXFCONFD=\"$(top_builddir)/xfconfd/xfconfd\" \
- -I$(top_srcdir) \
- -I$(top_srcdir)/tests \
- $(GLIB_CFLAGS)
-
-LIBS = \
- $(top_builddir)/xfconf/libxfconf-$(LIBXFCONF_VERSION_API).la
-
t_set_string_SOURCES = t-set-string.c
t_set_int_SOURCES = t-set-int.c
t_set_uint64_SOURCES = t-set-uint64.c
@@ -37,12 +15,4 @@
t_set_boolean_SOURCES = t-set-boolean.c
t_set_stringlist_SOURCES = t-set-stringlist.c
-%.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)
+include $(top_srcdir)/tests/Makefile.inc
Modified: xfconf/trunk/tests/test-template.sh.in
===================================================================
--- xfconf/trunk/tests/test-template.sh.in 2008-04-11 05:24:39 UTC (rev
26822)
+++ xfconf/trunk/tests/test-template.sh.in 2008-04-11 05:29:07 UTC (rev
26823)
@@ -4,7 +4,7 @@
export DBUS_SESSION_BUS_ADDRESS
export DBUS_SESSION_BUS_PID
-export XDG_CONFIG_HOME="../test-xdg_config_home"
+export XDG_CONFIG_HOME # make sure it's exported from the makefile
export XDG_CONFIG_DIRS=""
./@TEST_NAME@
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
