X-Git-Url: http://sjero.net/git/?p=wget;a=blobdiff_plain;f=tests%2FMakefile.am;h=e2deb980f68a4344911eb9b60daaddc6ada23c1e;hp=efbb5b4ad1f749114ebe8f374f1f91c7f3f324e6;hb=58a9721edf16684ca99b1c301a4768ade07eb03b;hpb=1274565a64130012b40b053b989b7e2eaba1388f diff --git a/tests/Makefile.am b/tests/Makefile.am index efbb5b4a..e2deb980 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,6 +1,7 @@ # Makefile for `wget' utility # Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, -# 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. +# 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, +# Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -33,6 +34,8 @@ PERL = perl PERLRUN = $(PERL) -I$(srcdir) +LIBS = @LIBSSL@ @LIBGNUTLS@ @LIBICONV@ @LIBINTL@ @W32LIBS@ @LIBS@ + .PHONY: test run-unit-tests run-px-tests check-local: test @@ -50,9 +53,6 @@ test: ../src/wget$(EXEEXT) run-unit-tests run-px-tests ../lib/libgnu.a: cd ../lib && $(MAKE) $(AM_MAKEFLAGS) -../md5/libmd5.a: - cd ../lib && $(MAKE) $(AM_MAKEFLAGS) - run-unit-tests: unit-tests$(EXEEXT) ../src/libunittest.a ./unit-tests$(EXEEXT) @@ -60,9 +60,11 @@ run-px-tests: WgetTest.pm ../src/wget$(EXEEXT) $(srcdir)/run-px $(top_srcdir) EXTRA_DIST = FTPServer.pm FTPTest.pm HTTPServer.pm HTTPTest.pm \ + WgetFeature.pm WgetFeature.cfg \ Test-auth-basic.px \ Test-auth-no-challenge.px \ Test-auth-no-challenge-url.px \ + Test-auth-with-content-disposition.px \ Test-c-full.px \ Test-c-partial.px \ Test-c.px \ @@ -72,7 +74,8 @@ EXTRA_DIST = FTPServer.pm FTPTest.pm HTTPServer.pm HTTPTest.pm \ Test-E-k-K.px \ Test-E-k.px \ Test-ftp.px \ - Test-ftp-pasv-fail.px \ + Test-ftp-pasv-fail.px \ + Test-ftp-bad-list.px \ Test-ftp-recursive.px \ Test-ftp-iri.px \ Test-ftp-iri-fallback.px \ @@ -81,6 +84,8 @@ EXTRA_DIST = FTPServer.pm FTPTest.pm HTTPServer.pm HTTPTest.pm \ Test-HTTP-Content-Disposition-1.px \ Test-HTTP-Content-Disposition-2.px \ Test-HTTP-Content-Disposition.px \ + Test-i-ftp.px \ + Test-i-http.px \ Test-idn-headers.px \ Test-idn-meta.px \ Test-idn-cmd.px \ @@ -126,7 +131,6 @@ EXTRA_DIST = FTPServer.pm FTPTest.pm HTTPServer.pm HTTPTest.pm \ check_PROGRAMS = unit-tests unit_tests_SOURCES = -LDADD = ../src/libunittest.a ../lib/libgnu.a @LIBSSL@ @LIBGNUTLS@ \ - @MD5_LDADD@ +LDADD = ../src/libunittest.a ../lib/libgnu.a $(LIBS) CLEANFILES = *~ *.bak core core.[0-9]*