httpd-test-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ran...@apache.org
Subject cvs commit: httpd-test/perl-framework/Apache-Test/lib/Apache TestConfig.pm TestRun.pm
Date Thu, 04 Mar 2004 05:25:29 GMT
randyk      2004/03/03 21:25:29

  Modified:    perl-framework/Apache-Test Changes
               perl-framework/Apache-Test/lib/Apache TestConfig.pm
                        TestRun.pm
  Log:
  fix for Win32 to allow spaces in supplied paths.
  
  Revision  Changes    Path
  1.100     +3 -0      httpd-test/perl-framework/Apache-Test/Changes
  
  Index: Changes
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/Changes,v
  retrieving revision 1.99
  retrieving revision 1.100
  diff -u -r1.99 -r1.100
  --- Changes	2 Mar 2004 17:49:37 -0000	1.99
  +++ Changes	4 Mar 2004 05:25:28 -0000	1.100
  @@ -8,6 +8,9 @@
   
   =item 1.09-dev
   
  +handle cases on Win32 when supplied paths have spaces in their
  +names [Stas]
  +
   c-modules build errors are no longer ignored [Stas]
   
   change -DAPACHE1 (and like defines) to -D APACHE1 to fix Win32
  
  
  
  1.212     +10 -0     httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfig.pm
  
  Index: TestConfig.pm
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfig.pm,v
  retrieving revision 1.211
  retrieving revision 1.212
  diff -u -r1.211 -r1.212
  --- TestConfig.pm	24 Feb 2004 19:27:13 -0000	1.211
  +++ TestConfig.pm	4 Mar 2004 05:25:29 -0000	1.212
  @@ -68,6 +68,16 @@
      (map { $_ . '_module_name', "$_ module name"} qw(cgi ssl thread access auth)),
   );
   
  +my %filepath_conf_opts = map { $_ => 1 }
  +    qw(top_dir t_dir t_conf t_logs t_conf_file src_dir serverroot
  +       documentroot bindir sbindir httpd apxs httpd_conf perlpod sslca
  +       libmodperl);
  +
  +sub conf_opt_is_a_filepath {
  +    my $opt = shift;
  +    $opt && exists $filepath_conf_opts{$opt};
  +}
  +
   sub usage {
       for my $hash (\%Usage) {
           for (sort keys %$hash){
  
  
  
  1.155     +9 -0      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.154
  retrieving revision 1.155
  diff -u -r1.154 -r1.155
  --- TestRun.pm	25 Feb 2004 21:35:40 -0000	1.154
  +++ TestRun.pm	4 Mar 2004 05:25:29 -0000	1.155
  @@ -238,6 +238,15 @@
           push @argv, $val;
       }
   
  +    # fixup the filepath options on win32 (spaces, short names, etc.)
  +    if (Apache::TestConfig::WIN32) {
  +        for my $key (keys %conf_opts) {
  +            next unless Apache::TestConfig::conf_opt_is_a_filepath($key);
  +            next unless -e $conf_opts{$key};
  +            $conf_opts{$key} = Win32::GetShortPathName($conf_opts{$key});
  +        }
  +    }
  +
       $opts{req_args} = \%req_args;
   
       # only test files/dirs if any at all are left in argv
  
  
  

Mime
View raw message