Automated merge.

diff --combined tests/ChangeLog
index 6e2b41a4994e2dfc3ff80f904f8ef340c9e84fdd,683f099f322234ef42c10c53cd783331d2b5607a..5b0d571d6deaf62a599ef1cf2a48d67f5b3632a5
--- 1/tests/ChangeLog
--- 2/tests/ChangeLog
+++ b/tests/ChangeLog
@@@ -1,8 -1,18 +1,23 @@@
 +2009-09-01  Micah Cowan  <micah@cowan.name>
 +
 +      * Makefile.am (../src/libunittest.a): Make it a phony target,
 +      so we always make sure to get up-to-date unit-test runs.
 +
+ 2009-09-01  Steven Schubiger  <stsc@member.fsf.org>
+ 
+       * Makefile.am: Add Test-cookies.px, Test-cookies-401.px
+       and Test-restrict-ascii.px to EXTRA_DIST.
+ 
+ 2009-08-31  Steven Schubiger  <stsc@member.fsf.org>
+ 
+       * Makefile.am: Add Test-k.px to EXTRA_DIST.
+ 
+ 2009-08-29  Steven Schubiger  <stsc@member.fsf.org>
+ 
+       * run-px: Add Test-k.px to the list.
+ 
+       * Test-k.px: Test escaping of semicolons in local file strings.
+ 
  2009-08-27  Micah Cowan  <micah@cowan.name>
  
        * WgetTest.pm.in (run): Shift the errcode right by 8 binary places.

diff --combined tests/Makefile.am
index 0c3fed4e87c3a95a7b9d01180874506880c14c52,7cc5fd4c8e58218d500fe9529d4a138ce3bbd716..7d7a25245a00f81bbc3a8fadd11397113cff0424
--- 1/tests/Makefile.am
--- 2/tests/Makefile.am
+++ b/tests/Makefile.am
@@@ -42,8 -42,6 +42,8 @@@ test: ../src/wget$(EXEEXT) run-unit-tes
  ../src/wget$(EXEEXT):
        cd ../src && $(MAKE) $(AM_MAKEFLAGS)
  
 +# Make libunittest "PHONY" so we're always sure we're up-to-date.
 +.PHONY: ../src/libunittest.a
  ../src/libunittest.a:
        cd ../src && $(MAKE) $(AM_MAKEFLAGS) libunittest.a
  
@@@ -53,7 -51,7 +53,7 @@@
  ../md5/libmd5.a:
        cd ../lib && $(MAKE) $(AM_MAKEFLAGS)
  
 -run-unit-tests: unit-tests$(EXEEXT)
 +run-unit-tests: unit-tests$(EXEEXT) ../src/libunittest.a
        ./unit-tests$(EXEEXT)
  
  run-px-tests: WgetTest.pm ../src/wget$(EXEEXT)
@@@ -67,6 -65,8 +67,8 @@@ EXTRA_DIST = FTPServer.pm FTPTest.pm HT
               Test-c-partial.px \
               Test-c.px \
               Test-c-shorter.px \
+              Test-cookies.px \
+              Test-cookies-401.px \
               Test-E-k-K.px \
               Test-E-k.px \
               Test-ftp.px \
@@@ -86,6 -86,7 +88,7 @@@
               Test-iri-disabled.px \
               Test-iri-forced-remote.px \
               Test-iri-list.px \
+              Test-k.px \
               Test-meta-robots.px \
               Test-N-current.px \
               Test-N-HTTP-Content-Disposition.px \
@@@ -108,6 -109,7 +111,7 @@@
               Test-O.px \
               Test-proxied-https-auth.px \
               Test-proxy-auth-basic.px \
+              Test-restrict-ascii.px \
               Test-Restrict-Lowercase.px \
               Test-Restrict-Uppercase.px \
               Test--spider-fail.px \
@@@ -119,9 -121,9 +123,9 @@@
               run-px certs
  
  check_PROGRAMS = unit-tests
 -unit_tests_SOURCES = 
 -#unit-tests: ../src/libunittest.a ../lib/libgnu.a
 +unit_tests_SOURCES =
 +unit-tests: ../src/libunittest.a
  LDADD = ../src/libunittest.a ../lib/libgnu.a @LIBSSL@ @LIBGNUTLS@ \
 -        @MD5_LDADD@
 +    @MD5_LDADD@
  
  CLEANFILES = *~ *.bak core core.[0-9]*