moparisthebest/wget
1
0
Fork 0
mirror of https://github.com/moparisthebest/wget synced 2024-07-03 16:38:41 -04:00
Code Issues Releases Wiki Activity

Fix unit tests build in a VPATH.

Browse Source
This commit is contained in:
Giuseppe Scrivano 2010-05-07 13:10:09 +02:00
parent b2e34eb6a9
commit 5a97871f5d
4 changed files with 41 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ChangeLog
View File

@ -1,5 +1,7 @@
2010-05-07 Giuseppe Scrivano <gscrivano@gnu.org> 2010-05-07 Giuseppe Scrivano <gscrivano@gnu.org>
* Makefile.am (libunittest_a_CPPFLAGS): Add -I$(top_builddir)/lib.
* mswindows.h: Always include <winsock2.h> and <ws2tcpip.h>. Do not * mswindows.h: Always include <winsock2.h> and <ws2tcpip.h>. Do not
include <winsock.h>. include <winsock.h>.
[! INHIBIT_WRAP]: Remove macro's socket, bind, connect, accept, recv, [! INHIBIT_WRAP]: Remove macro's socket, bind, connect, accept, recv,

2
src/Makefile.am
View File

@ -88,7 +88,7 @@ version.c: $(wget_SOURCES) ../lib/libgnu.a $(MD5_LDADD) \
check_LIBRARIES = libunittest.a check_LIBRARIES = libunittest.a
libunittest_a_SOURCES = $(wget_SOURCES) test.c build_info.c test.h libunittest_a_SOURCES = $(wget_SOURCES) test.c build_info.c test.h
nodist_libunittest_a_SOURCES = version.c nodist_libunittest_a_SOURCES = version.c
libunittest_a_CPPFLAGS = -DTESTING -I$(top_srcdir)/lib libunittest_a_CPPFLAGS = -DTESTING -I$(top_builddir)/lib -I$(top_srcdir)/lib
libunittest_a_LIBADD = $(LIBOBJS) libunittest_a_LIBADD = $(LIBOBJS)
EXTRA_DIST = build_info.c.in EXTRA_DIST = build_info.c.in

5
tests/ChangeLog
View File

@ -1,3 +1,8 @@
2010-05-07 Giuseppe Scrivano <gscrivano@gnu.org>
* Makefile.am (LIBS): Add definition.
(LDADD): Add LIBS.
2010-03-01 Steven Schubiger <stsc@member.fsf.org> 2010-03-01 Steven Schubiger <stsc@member.fsf.org>
* Test-i-ftp.px: Test --input-file in conjunction with FTP. * Test-i-ftp.px: Test --input-file in conjunction with FTP.

5
tests/Makefile.am
View File

@ -33,6 +33,8 @@
PERL = perl PERL = perl
PERLRUN = $(PERL) -I$(srcdir) PERLRUN = $(PERL) -I$(srcdir)
LIBS = @LIBSSL@ @LIBGNUTLS@ @LIBICONV@ @LIBINTL@ @W32LIBS@ @LIBS@
.PHONY: test run-unit-tests run-px-tests .PHONY: test run-unit-tests run-px-tests
check-local: test check-local: test
@ -131,7 +133,6 @@ EXTRA_DIST = FTPServer.pm FTPTest.pm HTTPServer.pm HTTPTest.pm \
check_PROGRAMS = unit-tests check_PROGRAMS = unit-tests
unit_tests_SOURCES = unit_tests_SOURCES =
LDADD = ../src/libunittest.a ../lib/libgnu.a @LIBSSL@ @LIBGNUTLS@ \ LDADD = ../src/libunittest.a ../lib/libgnu.a @MD5_LDADD@ $(LIBS)
@MD5_LDADD@
CLEANFILES = *~ *.bak core core.[0-9]* CLEANFILES = *~ *.bak core core.[0-9]*