]> sjero.net Git - wget/commitdiff
Automated merge.
authorMicah Cowan <micah@cowan.name>
Sun, 6 Sep 2009 21:08:56 +0000 (14:08 -0700)
committerMicah Cowan <micah@cowan.name>
Sun, 6 Sep 2009 21:08:56 +0000 (14:08 -0700)
1  2 
src/ChangeLog
tests/ChangeLog
tests/Makefile.am
tests/run-px

diff --combined src/ChangeLog
index 10e80080626d6736eaca65beb2a2c0602ffd02a2,fabc8b8f7e9d8cc66266a1e102dca458b9dc6045..0c60ebfb1869e29ebe6b886e2f2eea47c88be5c1
@@@ -1,13 -1,10 +1,20 @@@
+ 2009-09-06  Micah Cowan  <micah@cowan.name>
+       * ftp.c (getftp, ftp_loop_internal): Separate "len" input/output
+       parameter (with different meanings for input and output), into two
+       separate parameters, one input (passed_expected_bytes) and one
+       output (qtyread). Fixes bug #26870.
 +2009-09-05  Steven Schubiger  <stsc@member.fsf.org>
 +
 +      * retr.h: Declare set_local_file() to avoid build warnings.
 +
 +2009-09-05  Gisle Vanem  <gvanem@broadpark.no>
 +
 +      * connect.c, init.c, main.c, openssl.c, options.h:  Replace
 +      "ifdef MSDOS" with "ifdef USE_WATT32" since DOS-targets in fact
 +      use the Watt-32 tcp/ip stack.
 +
  2009-09-04  Micah Cowan  <micah@cowan.name>
  
        * Makefile.am: Move build_info.c to wget_SOURCES from
diff --combined tests/ChangeLog
index f6327b2e3939cf524046a9bc3c14f76d72e79cfb,dcc98e044c9a38cd00f7ec307b29120310e2bee3..a0f5185ae5086ae6b157e6e2e4633ddea4cb91f1
@@@ -1,26 -1,40 +1,63 @@@
+ 2009-09-06  Micah Cowan  <micah@cowan.name>
+       * WgetTest.pm.in (_setup): Don't expect error codes from
+       _setup_server; none are returned.
+       (quotechar, _show_diff): Added facilities for expounding on where
+       output didn't match expectations.
+       (_verify_download): Use _show_diff.
+       * FTPTest.pm (_setup_server): Pass value of server_behavior to
+       FTPServer initialization.
+       * Test-ftp-pasv-fail.px: Added.
+       * run-px, Makefile.am (EXTRA_DIST): Added Test-ftp-pasv-fail.px.
+       * WgetTest.pm.in: Added "server_behavior" to the set of accepted
+       initialization values.
+       * FTPServer.pm (__open_data_connection): Add "server_behavior" to
+       the set of accepted initialization values.
+       (run): Honor the 'fail_on_pasv' server behavior setting, to
+       trigger the Wget getftp glitch.
+ 2009-09-05  Micah Cowan  <micah@cowan.name>
+       * Test-ftp-recursive.px: Added.
+       * run-px, Makefile.am (EXTRA_DIST): Added Test-ftp-recursive.px.
+       * FTPTest.pm (_setup_server): Don't construct the "input"
+       directory's contents, just pass the URLs structure to
+       FTPServer->new.
+       * FTPServer.pm: Rewrote portions, so that the server now uses the
+       information from the %urls hash directly, rather than reading from
+       real files. Added an FTPPaths package to the file.
+ 2009-09-04  Micah Cowan  <micah@cowan.name>
+       * WgetTest.pm.in (run): Error-checking improvements.
 +2009-09-05  Steven Schubiger  <stsc@member.fsf.org>
 +
 +      * run-px: Introduce two new diagnostics: Skip and Unknown.
 +
 +      * WgetFeature.pm (import): Parse the version output of Wget
 +      and assert the availability of a feature.
 +
 +      * WgetFeature.cfg: Messages to be printed in absence of a
 +      required feature.
 +
 +      * Test-ftp-iri-disabled.px, Test-ftp-iri-fallback.px,
 +      Test-ftp-iri-recursive.px, Test-ftp-iri.px, Test-idn-cmd.px,
 +      Test-idn-headers.px, Test-idn-meta.px, Test-idn-robots.px,
 +      Test-iri-forced-remote.px, Test-iri-list.px,
 +      Test-iri-percent.px, Test-iri.px: Use WgetFeature.pm to
 +      check for the presence of the IDN/IRI feature.
 +
 +      * Test-proxied-https-auth.px: Replace grepping for a feature
 +      with loading WgetFeature.pm at compile-time.
 +
 +      * Makefile.am: Add WgetFeature.pm and WgetFeature.cfg
 +      to EXTRA_DIST.
 +
  2009-09-02  Micah Cowan  <micah@cowan.name>
  
        * Makefile.am (unit-tests): explicit dependency is
diff --combined tests/Makefile.am
index ec68d6d5af685bcb8ea08937cf2e164129c3ae11,efbb5b4ad1f749114ebe8f374f1f91c7f3f324e6..768bd084aeea42ae38fd700322ebfbaac9945544
@@@ -60,7 -60,6 +60,7 @@@ run-px-tests: WgetTest.pm ../src/wget$(
        $(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 \
@@@ -73,6 -72,8 +73,8 @@@
               Test-E-k-K.px \
               Test-E-k.px \
               Test-ftp.px \
+            Test-ftp-pasv-fail.px \
+              Test-ftp-recursive.px \
               Test-ftp-iri.px \
               Test-ftp-iri-fallback.px \
               Test-ftp-iri-recursive.px \
diff --combined tests/run-px
index 29765c9516be14d9a027fa687f8cd362806b861d,102c75dc41cbbe26e3307dd94b863e773ce84f53..52101fc6720bc2f7eddbb63f1914f70840e3159f
@@@ -4,7 -4,8 +4,7 @@@ use 5.006
  use strict;
  use warnings;
  
 -use Term::ANSIColor ':constants';
 -$Term::ANSIColor::AUTORESET = 1;
 +use Term::ANSIColor;
  
  die "Please specify the top source directory.\n" if (!@ARGV);
  my $top_srcdir = shift @ARGV;
@@@ -26,6 -27,8 +26,8 @@@ my @tests = 
      'Test-E-k-K.px',
      'Test-E-k.px',
      'Test-ftp.px',
+     'Test-ftp-pasv-fail.px',
+     'Test-ftp-recursive.px',
      'Test-ftp-iri.px',
      'Test-ftp-iri-fallback.px',
      'Test-ftp-iri-recursive.px',
@@@ -81,42 -84,26 +83,42 @@@ my @tested
  foreach my $test (@tests) {
      print "Running $test\n\n";
      system("$^X -I$top_srcdir/tests $top_srcdir/tests/$test $top_srcdir");
 -    push @tested, { name => $test, result => $? };
 +    push @tested, { name => $test, result => $? >> 8 };
  }
  
  foreach my $var (qw(SYSTEM_WGETRC WGETRC)) {
      delete $ENV{$var};
  }
  
 +my %exit = (
 +    pass    => 0,
 +    fail    => 1,
 +    skip    => 2,
 +    unknown => 3, # or greater
 +);
 +
 +my %colors = (
 +    $exit{pass}    => colored('pass:',    'green'  ),
 +    $exit{fail}    => colored('FAIL:',    'red'    ),
 +    $exit{skip}    => colored('Skip:',    'yellow' ),
 +    $exit{unknown} => colored('Unknown:', 'magenta'),
 +);
 +
  print "\n";
  foreach my $test (@tested) {
 -    ($test->{result} == 0)
 -      ? print GREEN 'pass: '
 -      : print RED 'FAIL: ';
 -   print $test->{name}, "\n";
 +    my $colored = exists $colors{$test->{result}}
 +      ? $colors{$test->{result}}
 +      : $colors{$exit{unknown}};
 +    print "$colored $test->{name}\n";
  }
  
  my $count = sub
  {
      return {
 -      pass => sub { scalar grep $_->{result} == 0, @tested },
 -      fail => sub { scalar grep $_->{result} != 0, @tested },
 +      pass    => sub { scalar grep $_->{result} == $exit{pass},    @tested },
 +      fail    => sub { scalar grep $_->{result} == $exit{fail},    @tested },
 +      skip    => sub { scalar grep $_->{result} == $exit{skip},    @tested },
 +      unknown => sub { scalar grep $_->{result} >= $exit{unknown}, @tested },
      }->{$_[0]}->();
  };
  
@@@ -125,7 -112,6 +127,7 @@@ my $summary = su
      my @lines = (
          "${\scalar @tested} tests were run",
          "${\$count->('pass')} PASS, ${\$count->('fail')} FAIL",
 +        "${\$count->('skip')} SKIP, ${\$count->('unknown')} UNKNOWN",
      );
      my $len_longest = sub
      {
  
  print "\n";
  print $count->('fail')
 -  ? RED $summary
 -  : GREEN $summary;
 +  ? colored($summary, 'red')
 +  : colored($summary, 'green');
  print "\n";
  
  exit $count->('fail');