Hi all,
I have just been doing a little more testing to make sure that we have
everything set up for distribution, and I have run accross a strange
bug. By applying the two small patches (made with diff), to apr and
neon, I am able to to a make distcheck from a vpath build. I.e. I have
sources installed in /home/kevin/projects/subversion, and I build in
/home/kevin/projects/svn-build by doing ../subversion/configure && make.
Note that it has to be a vpath build because of the way I faked out the
distdir: target in neon and apr.
Then from /home/projects/svn-build I can do a make distcheck, and
everything compiles, but when it gets into make check, the client tests
fail doing the update from t1 to t2. I have so far been unable to
determine why. Note that it works fine if I do a make check from the
svn-build directory, and also when built in the source directory. It is
only in the make distcheck target that it seems to fail. The error from
the check is included below. If anyone has a simple answer for this
behavior, I'd love to hear it, otherwise, I'll keep trying to track it
down. BTW, it isn't because the builddir has an `=' in it, because I
tried changing that.
Error Message:
--------------
sh ../../../../subversion/client/tests/svn-test.sh ../../../../subversion/tests-common/xml
Checking out t1.
A t1/iota
A t1/A
A t1/A/mu
A t1/A/B
A t1/A/B/lambda
A t1/A/B/E
A t1/A/B/E/alpha
A t1/A/B/E/beta
A t1/A/B/F
A t1/A/C
A t1/A/D
A t1/A/D/gamma
A t1/A/D/G
A t1/A/D/G/pi
A t1/A/D/G/rho
A t1/A/D/G/tau
A t1/A/D/H
A t1/A/D/H/chi
A t1/A/D/H/psi
A t1/A/D/H/omega
Modifying t1/A/D/G/pi.
Modifying t1/A/mu.
Adding t1/newfile1.
Adding t1/A/B/E/newfile2.
Deleting versioned file A/D/H/omega, with --force.
Deleting added files A/B/E/newfile2, without --force.
Committing changes in t1.
Deleting ./A/B/E/newfile2
Deleting ./A/D/H/omega
Adding ./newfile1
Changing ./A/mu
Changing ./A/D/G/pi
Commit succeeded.
Updating t2 from changes in t1.
D ./A/B/E/newfile2
D ./A/D/H/omega
A ./newfile1
../../../../subversion/client/tests/svn-test.sh: line 88: 7371 Segmentation fault
../${SVN_PROG} update --xml-file ../${COMMIT_RESULTFILE_NAME}-2.xml --revision 2
Oops, problem: 7
make[4]: *** [check] Error 139
Patch for apr:
--------------
*** apr/Makefile.in Thu Jan 25 10:00:55 2001
--- apr/Makefile.in.new Thu Jan 25 09:54:57 2001
***************
*** 86,90 ****
--- 86,101 ----
fi \
done )
+ distdir:
+ cp -ax $(srcdir)/* $(distdir)
+
+ check:
+
+ dvi:
+
+ installcheck:
+
+ install:
+
# DO NOT REMOVE
docs: $(INCDIR)/*.h
Patch for neon:
---------------
diff -c -r neon.orig/Makefile.in neon/Makefile.in
*** neon.orig/Makefile.in Tue Jan 23 11:29:56 2001
--- neon/Makefile.in Thu Jan 25 09:54:39 2001
***************
*** 26,32 ****
# Where does top_builddir come from?
top_builddir = .
srcdir = @srcdir@
- VPATH = @srcdir@
# intl stuff
localedir = $(datadir)/locale
gnulocaledir = $(prefix)/share/locale
--- 26,31 ----
***************
*** 71,89 ****
.SUFFIXES:
.SUFFIXES: .c .lo .o
! .c.lo:
$(LIBTOOL) --quiet --mode=compile $(COMPILE) -c $< -o $@
! .c.o:
$(COMPILE) -c $< -o $@
all: libneon.la
! libneon.la: $(OBJECTS)
$(LINK) -rpath $(libdir) -version-info $(NEON_INTERFACE_VERSION) -o $@ $(LDFLAGS) $(OBJECTS) $(LIBS)
@echo
@echo "Compilation complete. Run '$(MAKE) install' (as root?) to install neon."
@echo
clean:
rm -f $(OBJECTS) $(example_PROGS) $(nget_OBJS) $(nbrowse_OBJS) $(nserver_OBJS)
--- 70,92 ----
.SUFFIXES:
.SUFFIXES: .c .lo .o
! $(top_builddir)/src/%.lo: $(srcdir)/src/%.c
$(LIBTOOL) --quiet --mode=compile $(COMPILE) -c $< -o $@
!
! $(top_builddir)/src/%.o: $(srcdir)/src/%.c
$(COMPILE) -c $< -o $@
all: libneon.la
! libneon.la: $(top_builddir)/src $(OBJECTS)
$(LINK) -rpath $(libdir) -version-info $(NEON_INTERFACE_VERSION) -o $@ $(LDFLAGS) $(OBJECTS) $(LIBS)
@echo
@echo "Compilation complete. Run '$(MAKE) install' (as root?) to install neon."
@echo
+ $(top_builddir)/src:
+ mkdir $(top_builddir)/src
+
clean:
rm -f $(OBJECTS) $(example_PROGS) $(nget_OBJS) $(nbrowse_OBJS) $(nserver_OBJS)
***************
*** 154,159 ****
--- 157,171 ----
neon_dir = $(srcdir)/src
config_h = config.h
obj_ext = lo
+
+ distdir:
+ cp -ax $(srcdir)/* $(distdir)
+
+ check:
+
+ dvi:
+
+ installcheck:
# FIXME: This breaks on systems with BSD make. Sorry. :(
include $(srcdir)/src/Makefile.incl
diff -c -r neon.orig/src/dav_props.h neon/src/dav_props.h
*** neon.orig/src/dav_props.h Wed Sep 6 19:26:43 2000
--- neon/src/dav_props.h Tue Jan 23 12:17:53 2001
***************
*** 22,29 ****
#ifndef DAV_PROPS_H
#define DAV_PROPS_H
! #include <http_request.h>
! #include <dav_207.h>
BEGIN_NEON_DECLS
--- 22,29 ----
#ifndef DAV_PROPS_H
#define DAV_PROPS_H
! #include "http_request.h"
! #include "dav_207.h"
BEGIN_NEON_DECLS
--
>~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Kevin Pilch-Bisson
kevin@pilch-bisson.net
http://www.pilch-bisson.net
- application/pgp-signature attachment: stored
Received on Sat Oct 21 14:36:19 2006