moparisthebest
/
wget
mirror of https://github.com/moparisthebest/wget
1
0
Fork 0
Code Issues Releases Wiki Activity

[svn] Improved support for unit testing

This commit is contained in:
mtortonesi 2005-11-02 07:48:45 -08:00
parent d12bf532d5
commit b285d8070b
6 changed files with 19 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2005-11-02 Mauro Tortonesi <mauro@ferrara.linux.it>
* Makefile.in: Improved support for unit testing.
* configure.in: Ditto.
2005-10-27 Mauro Tortonesi <mauro@ferrara.linux.it>
* Makefile.in: Added basic support for unit testing.

11
Makefile.in
View File

@ -80,19 +80,14 @@ CFLAGS='$(CFLAGS)' LDFLAGS='$(LDFLAGS)' LIBS='$(LIBS)' \
prefix='$(prefix)' exec_prefix='$(exec_prefix)' bindir='$(bindir)' \
infodir='$(infodir)' mandir='$(mandir)' manext='$(manext)'
TESTDEFS = CC='$(CC)' CPPFLAGS='$(CPPFLAGS) -DTESTING' DEFS='$(DEFS)' \
CFLAGS='$(CFLAGS)' LDFLAGS='$(LDFLAGS)' LIBS='$(LIBS)' \
prefix='$(prefix)' exec_prefix='$(exec_prefix)' bindir='$(bindir)' \
infodir='$(infodir)' mandir='$(mandir)' manext='$(manext)'
# subdirectories in the distribution
SUBDIRS = src doc po util windows
SUBDIRS = src doc po tests util windows
# default target
all: src/config.h Makefile $(SUBDIRS)
test: src/config.h Makefile
cd src && $(MAKE) $(TESTDEFS) clean && $(MAKE) $(TESTDEFS) test$(exeext)
unittest: src/config.h Makefile
cd tests && $(MAKE) $(TESTDEFS) $@
check: all

2
configure.in
View File

@ -476,7 +476,7 @@ dnl
dnl Create output
dnl
AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile util/Makefile
po/Makefile.in windows/Makefile])
po/Makefile.in tests/Makefile windows/Makefile])
AC_CONFIG_HEADERS([src/config.h])
AH_BOTTOM([
#include "config-post.h"

5
src/ChangeLog
View File

@ -1,3 +1,8 @@
2005-11-02 Mauro Tortonesi <mauro@ferrara.linux.it>
* Makefile.in: Removed support for unit testing (now it is in
tests/Makefile.in).
2005-10-27 Mauro Tortonesi <mauro@ferrara.linux.it>
* Makefile.in: Added basic support for unit testing.

20
src/Makefile.in
View File

@ -102,26 +102,6 @@ $(OBJ): config-post.h config.h connect.h convert.h cookies.h ftp.h \
progress.h ptimer.h recur.h res.h retr.h safe-ctype.h ssl.h \
sysdep.h url.h utils.h wget.h xmalloc.h
#
# Dependencies for test binary
#
TESTOBJ = $(ALLOCA) cmpt.o connect.o convert.o cookies.o \
ftp.o ftp-basic.o ftp-ls.o $(OPIE_OBJ) $(GETOPT_OBJ) hash.o \
host.o html-parse.o html-url.o http.o $(NTLM_OBJ) init.o \
log.o main.o $(MD5_OBJ) netrc.o progress.o ptimer.o recur.o \
res.o retr.o safe-ctype.o snprintf.o $(SSL_OBJ) test.o \
url.o utils.o version.o xmalloc.o
$(TESTOBJ): config-post.h config.h connect.h convert.h cookies.h ftp.h \
gen-md5.h getopt.h gnu-md5.h hash.h host.h html-parse.h \
http-ntlm.h init.h log.h mswindows.h netrc.h options.h \
progress.h ptimer.h recur.h res.h retr.h safe-ctype.h ssl.h \
sysdep.h test.h url.h utils.h wget.h xmalloc.h
test$(exeext): $(TESTOBJ)
$(LINK) $(TESTOBJ) $(LIBS)
#
# Dependencies for installing
#

8
tests/Makefile.in
View File

@ -81,10 +81,10 @@ unittest: test$(exeext)
# Dependencies for test binary
#
TESTOBJ = $(ALLOCA) ccache.o cmpt.o connect.o convert.o cookies.o \
TESTOBJ = $(ALLOCA) cmpt.o connect.o convert.o cookies.o \
ftp.o ftp-basic.o ftp-ls.o $(OPIE_OBJ) $(GETOPT_OBJ) hash.o \
host.o html-parse.o html-url.o http.o $(NTLM_OBJ) init.o \
log.o main.o $(MD5_OBJ) netrc.o progress.o protocol.o \
log.o main.o $(MD5_OBJ) netrc.o progress.o \
ptimer.o recur.o res.o retr.o safe-ctype.o snprintf.o \
$(SSL_OBJ) test.o url.o utils.o version.o xmalloc.o
@ -94,13 +94,13 @@ TESTOBJ = $(ALLOCA) ccache.o cmpt.o connect.o convert.o cookies.o \
# time, and it's a lot safer than attempting to get all the
# dependencies right.
HEADERS = ../src/ccache.h ../src/config-post.h ../src/config.h \
HEADERS = ../src/config-post.h ../src/config.h \
../src/connect.h ../src/convert.h ../src/cookies.h \
../src/ftp.h ../src/gen-md5.h ../src/getopt.h \
../src/gnu-md5.h ../src/hash.h ../src/host.h \
../src/html-parse.h ../src/http-ntlm.h ../src/init.h \
../src/log.h ../src/mswindows.h ../src/netrc.h \
../src/options.h ../src/progress.h ../src/protocol.h \
../src/options.h ../src/progress.h \
../src/ptimer.h ../src/recur.h ../src/res.h \
../src/retr.h ../src/safe-ctype.h ../src/ssl.h \
../src/sysdep.h ../src/test.h ../src/url.h \