dbus/test Makefile.am,1.43,1.44
Ralf Habacker
rhabacker at kemper.freedesktop.org
Sun Mar 4 10:53:31 PST 2007
Update of /cvs/dbus/dbus/test
In directory kemper:/tmp/cvs-serv23095/test
Modified Files:
Makefile.am
Log Message:
* test/Makefile.am: fixed test data copy problem in
out of source build, when sources came from svn or cvs.
Index: Makefile.am
===================================================================
RCS file: /cvs/dbus/dbus/test/Makefile.am,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- Makefile.am 1 Oct 2006 15:36:18 -0000 1.43
+++ Makefile.am 4 Mar 2007 18:53:29 -0000 1.44
@@ -104,7 +104,7 @@
for D in $(TESTDIRS); do \
test -d $(distdir)/$$D || mkdir $(distdir)/$$D || exit 1 ; \
done ; \
- FILES=`(cd $(srcdir) && $(FIND_TESTS) -o -name "*.in" -a -not -name Makefile.in)` ; \
+ FILES=`(cd $(srcdir) && $(FIND_TESTS) -o -name "*.in" -a -not -name Makefile.in | grep -Ev "(.svn|CVS)" )` ; \
for F in $$FILES; do \
echo '-- Disting file '$$F ; \
cp -f $(srcdir)/$$F $(distdir)/$$F || exit 1 ; \
@@ -117,7 +117,7 @@
test -d $(top_builddir)/test/$$D || mkdir $(top_builddir)/test/$$D || exit 1 ; \
done ; \
if ! (test $(srcdir) = . || test $(srcdir) -ef .) ; then \
- FILES=`(cd $(srcdir) && $(FIND_TESTS))` ; \
+ FILES=`(cd $(srcdir) && $(FIND_TESTS) | grep -Ev "(.svn|CVS)" )` ; \
for F in $$FILES; do \
SRC=$(srcdir)/$$F ; \
DEST=$(top_builddir)/test/$$F ; \
@@ -135,7 +135,7 @@
## this doesn't clean generated test data files when srcdir=builddir
clean-local:
if test $(srcdir) != . ; then \
- FILES=`(cd $(top_builddir)/test && $(FIND_TESTS))` ; \
+ FILES=`(cd $(top_builddir)/test && $(FIND_TESTS) | grep -Ev "(.svn|CVS)" )` ; \
for F in $$FILES; do \
DEST=$(top_builddir)/test/$$F ; \
echo '-- Deleting test file '$$F ; \
More information about the dbus-commit
mailing list