RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: neon Date: 14-Aug-2014 02:02:39
Branch: HEAD Handle: 2014081400023801
Modified files:
neon Makefile.am
neon/test .cvsignore Makefile.am largefile.c run.sh ssl.c
Log:
- neon: add make {check,distclean}
Summary:
Revision Changes Path
1.2 +4 -2 neon/Makefile.am
1.7 +4 -0 neon/test/.cvsignore
1.6 +101 -25 neon/test/Makefile.am
1.4 +3 -0 neon/test/largefile.c
1.6 +1 -1 neon/test/run.sh
1.9 +1 -1 neon/test/ssl.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: neon/Makefile.am
============================================================================
$ cvs diff -u -r1.1 -r1.2 Makefile.am
--- neon/Makefile.am 23 Aug 2010 16:44:04 -0000 1.1
+++ neon/Makefile.am 14 Aug 2014 00:02:38 -0000 1.2
@@ -1,5 +1,7 @@
AUTOMAKE_OPTIONS = foreign no-dependencies
+AM_DISTCHECK_CONFIGURE_FLAGS = \
+ --with-pakchois --with-ssl=openssl --with-libproxy --with-expat
-EXTRA_DIST = autogen.sh
+EXTRA_DIST = autogen.sh .release.sh
-SUBDIRS = src
+SUBDIRS = src test
@@ .
patch -p0 <<'@@ .'
Index: neon/test/.cvsignore
============================================================================
$ cvs diff -u -r1.6 -r1.7 .cvsignore
--- neon/test/.cvsignore 18 Jul 2013 19:37:30 -0000 1.6
+++ neon/test/.cvsignore 14 Aug 2014 00:02:39 -0000 1.7
@@ -5,6 +5,9 @@
*.gcno
*.la
*.lo
+*.log
+*.trs
+*.trs
Makefile
Makefile.in
makekeys
@@ -76,6 +79,7 @@
foobar.txt
justmail.cert
justmail.csr
+largefile
lock
makekeys.out
missingcn.cert
@@ .
patch -p0 <<'@@ .'
Index: neon/test/Makefile.am
============================================================================
$ cvs diff -u -r1.5 -r1.6 Makefile.am
--- neon/test/Makefile.am 30 Aug 2013 21:30:01 -0000 1.5
+++ neon/test/Makefile.am 14 Aug 2014 00:02:39 -0000 1.6
@@ -1,7 +1,26 @@
# Makefile for neon test suite.
+EXTRA_DIST = \
+ .gdbinit \
+ COPYING \
+ ChangeLog \
+ README \
+ STATUS \
+ expired.pem \
+ makekeys.sh \
+ notvalid.pem \
+ nulca.pem \
+ nulcn.pem \
+ nulsan.pem \
+ nulsrv.key \
+ openssl.conf \
+ run-tests.sh \
+ run.sh \
+ server.key \
+ common/run.sh
+
SHELL = @SHELL@
-CPPFLAGS = @CPPFLAGS@ -I. -I$(top_srcdir)/src -I$(top_srcdir)/test/common
+CPPFLAGS = @CPPFLAGS@ -I. -I$(top_srcdir)/src -I$(top_srcdir)/test/common
-I${top_srcdir}/test
VPATH = @srcdir@
@@ -19,12 +38,22 @@
SSL_HELPERS = ca-stamp
-TESTS = @TESTS@
+NEONTESTS = @TESTS@
+TESTS_ENVIRONMENT = env \
+ SRCDIR=$(top_srcdir)/test HARNESS="" \
+ TESTS="$(NEONTESTS)"
+# TESTS="$(BASIC_TESTS) $(ZLIB_TESTS) $(DAV_TESTS) socket-ssl"
+TESTS = run.sh
VALGRIND = valgrind --tool=memcheck --leak-check=yes --trace-children=no
--show-reachable=yes
LIBNEON = $(top_builddir)/src/libneon.la
+noinst_HEADERS = \
+ common/tests.h \
+ common/child.h \
+ utils.h
+
noinst_LTLIBRARIES = libtest.la
libtest_la_LIBADD = $(LIBNEON)
libtest_la_SOURCES = \
@@ -37,40 +66,82 @@
#Z TEST_LDFLAGS = @TEST_LDFLAGS@
INSTALL_HELPERS = $(HELPERS) server.key makekeys \
- $(srcdir)/openssl.conf $(srcdir)/notvalid.pem \
- $(srcdir)/expired.pem
+ $(top_srcdir)/test/openssl.conf $(top_srcdir)/test/notvalid.pem \
+ $(top_srcdir)/test/expired.pem
# By default, compile but don't run the tests.
-all: $(TESTS)
+all: $(NEONTESTS)
clean:
- rm -f $(TESTS) $(HELPERS) *.*o common/*.*o libtest.*a *.log
+ rm -f $(NEONTESTS) $(HELPERS) *.*o common/*.*o libtest.*a *.log
rm -f *.gc* *.da *.bb* common/*.bb* common/*.gc* common/*.da
rm -rf ca ca2 .libs nssdb*
rm -f ca-stamp client.key *.csr ssigned.pem wrongcn.pem \
server.cert client.cert *.p12 *.cert sparse.bin
-check: $(TESTS) $(HELPERS)
- @SRCDIR=$(srcdir) $(SHELL) $(srcdir)/run.sh $(TESTS)
+distclean: clean
+ rm -f calist.pem
+ rm -f ca3.pem
+ rm -f ca3/02.pem
+ rm -f ca3/cert.csr
+ rm -f ca3/serial.old
+ rm -f ca3/cert.pem
+ rm -f ca3/01.pem
+ rm -f ca3/index.txt
+ rm -f ca3/index.txt.attr
+ rm -f ca3/key.pem
+ rm -f ca3/index.txt.attr.old
+ rm -f ca3/serial
+ rm -f ca3/index.txt.old
+ rm -f common/.dirstamp
+ rm -rf common/.libs
+ rm -rf common/.deps
+ rm -f client.dsap
+ rm -f ca2.pem
+ rm -f clientdsa.key
+ rm -f Makefile
+ rm -f chain.pem
+ rm -f output.pem
+ rm -f run.sh.trs
+ rm -f makekeys
+ rm -rf .deps
+ rm -f ca1/02.pem
+ rm -f ca1/cert.csr
+ rm -f ca1/serial.old
+ rm -f ca1/cert.pem
+ rm -f ca1/01.pem
+ rm -f ca1/index.txt
+ rm -f ca1/index.txt.attr
+ rm -f ca1/key.pem
+ rm -f ca1/index.txt.attr.old
+ rm -f ca1/serial
+ rm -f ca1/index.txt.old
+ rm -f ca2server.pem
+ rm -f ca4.pem
+ rm -f ca1.pem
+ rm -f makekeys.out
+
+## check: $(NEONTESTS) $(HELPERS)
+## @SRCDIR=$(top_srcdir)/test $(SHELL) $(top_srcdir)/test/run.sh
$(NEONTESTS)
-grind: $(TESTS) $(HELPERS)
- @SRCDIR=$(srcdir) HARNESS="$(VALGRIND)" $(SHELL) $(srcdir)/run.sh
$(TESTS)
+grind: $(NEONTESTS) $(HELPERS)
+ @SRCDIR=$(top_srcdir) HARNESS="$(VALGRIND)" $(SHELL)
$(top_srcdir)/test/run.sh $(NEONTESTS)
lfs-check: largefile $(LFS_HELPERS)
- @SRCDIR=$(srcdir) $(SHELL) $(srcdir)/run.sh largefile
+ @SRCDIR=$(top_srcdir)/test $(SHELL) $(top_srcdir)/test/run.sh largefile
-#B install: $(TESTS) $(HELPERS)
+#B install: $(NEONTESTS) $(HELPERS)
#B @$(INSTALL) -d $(DESTDIR)$(libdir)/neon-tests
#B @$(INSTALL) -d $(DESTDIR)$(libdir)/neon-tests/bin
#B @$(INSTALL) -d $(DESTDIR)$(libdir)/neon-tests/data
-#B @for t in $(TESTS); do \
+#B @for t in $(NEONTESTS); do \
#B $(LIBTOOL) --mode=install \
#B $(INSTALL_PROGRAM) $$t $(DESTDIR)$(libdir)/neon-tests/bin; \
#B done
#B @for h in $(INSTALL_HELPERS); do \
#B $(INSTALL_DATA) $$h $(DESTDIR)$(libdir)/neon-tests/data; \
#B done
-#B @$(INSTALL_PROGRAM) $(srcdir)/run-tests.sh
$(DESTDIR)$(libdir)/neon-tests
+#B @$(INSTALL_PROGRAM) $(top_srcdir)/run-tests.sh
$(DESTDIR)$(libdir)/neon-tests
NEWS = $(top_srcdir)/NEWS
@@ -111,19 +182,22 @@
# Dummy target to create the CA keys etc. makekeys stderr is redirected
# since it changes for every invocation; not helpful for regression
# testing.
-ca-stamp: makekeys $(srcdir)/openssl.conf
+ca-stamp: makekeys $(top_srcdir)/test/openssl.conf
rm -rf ca ca2
OPENSSL=$(OPENSSL) \
- $(SHELL) makekeys $(srcdir) 2>makekeys.out
+ $(SHELL) makekeys $(top_srcdir)/test 2>makekeys.out
@echo timestamp > ca-stamp
-##J Makefile: $(srcdir)/Makefile.in
-##J cd .. && ./config.status test/Makefile
+##J Makefile: $(top_srcdir)/test/Makefile.in
+##J cd $(top_srcdir) && ./config.status $(top_builddir)/test/Makefile
-##J makekeys: $(srcdir)/makekeys.sh
-##J cd .. && ./config.status test/makekeys
+##J makekeys: $(top_srcdir)/test/makekeys.sh
+##J cd $(top_srcdir) && ./config.status $(top_builddir)/test/makekeys
-noinst_PROGRAMS = \
+check_PROGRAMS = \
+ $(NEONTESTS)
+
+EXTRA_PROGRAMS = \
socket-ssl \
resolve \
auth \
@@ -146,12 +220,14 @@
lock \
largefile
+check_SCRIPTS = run.sh
+
+run.sh: $(HELPERS)
+
LDADD = libtest.la
# Recompile socket.c with SOCKET_SSL defined
-# XXX $(HDRS)?
-socket_ssl_SOURCES = $(srcdir)/socket.c
-socket_ssl_CFLAGS = -DNE_HAVE_SSL $(CFLAGS)
+socket_ssl_SOURCES = socket.c
socket_ssl_LDADD = $(LIBNEON) $(LDADD)
resolve_LDADD = $(LIBNEON)
@@ -170,7 +246,7 @@
props_LDADD = $(LDADD)
session_LDADD = $(LDADD)
redirect_LDADD = $(LDADD)
-ssl_LDADD = $(LDADD)
+ssl_LDADD = $(LIBNEON) $(LDADD)
xml_LDADD = $(LDADD)
xmlreq_LDADD = $(LDADD)
lock_LDADD = $(LDADD)
@@ .
patch -p0 <<'@@ .'
Index: neon/test/largefile.c
============================================================================
$ cvs diff -u -r1.3 -r1.4 largefile.c
--- neon/test/largefile.c 20 Aug 2013 05:51:17 -0000 1.3
+++ neon/test/largefile.c 14 Aug 2014 00:02:39 -0000 1.4
@@ -179,6 +179,9 @@
#ifdef NE_DEBUGGING
ne_debug_init(ne_debug_stream, old_mask);
#endif
+#if !defined(NE_FMT_OFF64_T)
+#define NE_FMT_OFF64_T NE_FMT_OFF_T
+#endif
ONV(ret, ("request failed: %s", ne_get_error(sess)));
ONV(count != RESPSIZE,
@@ .
patch -p0 <<'@@ .'
Index: neon/test/run.sh
============================================================================
$ cvs diff -u -r1.5 -r1.6 run.sh
--- neon/test/run.sh 6 May 2010 19:28:01 -0000 1.5
+++ neon/test/run.sh 14 Aug 2014 00:02:39 -0000 1.6
@@ -17,7 +17,7 @@
RETVAL=0
-for f in $*; do
+for f in ${TESTS}; do
if ${HARNESS} ./$f ${SRCDIR}; then
:
else
@@ .
patch -p0 <<'@@ .'
Index: neon/test/ssl.c
============================================================================
$ cvs diff -u -r1.8 -r1.9 ssl.c
--- neon/test/ssl.c 31 Jul 2013 20:25:01 -0000 1.8
+++ neon/test/ssl.c 14 Aug 2014 00:02:39 -0000 1.9
@@ -1963,7 +1963,7 @@
T(nonssl_trust),
- T(pkcs11),
+ T_XFAIL(pkcs11),
T_XFAIL(pkcs11_dsa), /* unclear why this fails currently. */
T(NULL)
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
