httpd-test-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject cvs commit: httpd-test/perl-framework/Apache-Test/lib/Apache TestRun.pm
Date Thu, 27 Mar 2003 22:19:30 GMT
stas        2003/03/27 14:19:30

  Modified:    perl-framework/Apache-Test/lib/Apache TestRun.pm
  Log:
  "verbose:1" is not supported by $Getopt::Long::VERSION < 2.27, so add a
  workaround that will work for older versions as well, by working around
  the need to use the new rule
  
  Revision  Changes    Path
  1.105     +7 -3      httpd-test/perl-framework/Apache-Test/lib/Apache/TestRun.pm
  
  Index: TestRun.pm
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestRun.pm,v
  retrieving revision 1.104
  retrieving revision 1.105
  diff -u -r1.104 -r1.105
  --- TestRun.pm	27 Mar 2003 07:57:06 -0000	1.104
  +++ TestRun.pm	27 Mar 2003 22:19:30 -0000	1.105
  @@ -23,8 +23,7 @@
   my %original_t_perms = ();
   
   my @std_run      = qw(start-httpd run-tests stop-httpd);
  -my @others       = qw(configure clean help ssl http11);
  -my @verbose_opts = qw(verbose);
  +my @others       = qw(verbose configure clean help ssl http11);
   my @flag_opts    = (@std_run, @others);
   my @string_opts  = qw(order trace);
   my @ostring_opts = qw(proxy ping);
  @@ -160,6 +159,12 @@
       local *ARGV = $argv;
       my(%opts, %vopts, %conf_opts);
   
  +    # a workaround to support -verbose and -verbose=0|1
  +    # $Getopt::Long::VERSION > 2.26 can use the "verbose:1" rule
  +    # but we have to support older versions as well
  +    @ARGV = grep defined, 
  +        map {/-verbose=(\d)/ ? ($1 ? '-verbose' : undef) : $_ } @ARGV;
  +
       # permute      : optional values can come before the options
       # pass_through : all unknown things are to be left in @ARGV
       Getopt::Long::Configure(qw(pass_through permute));
  @@ -167,7 +172,6 @@
       # grab from @ARGV only the options that we expect
       GetOptions(\%opts, @flag_opts, @help_opts,
                  (map "$_:s", @debug_opts, @request_opts, @ostring_opts),
  -               (map "$_:1", @verbose_opts),
                  (map "$_=s", @string_opts),
                  (map "$_=i", @num_opts),
                  (map { ("$_=s", $vopts{$_} ||= []) } @list_opts),
  
  
  

Mime
View raw message