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 TestMM.pm TestRun.pm
Date Wed, 26 Mar 2003 07:35:33 GMT
stas        2003/03/25 23:35:33

  Modified:    perl-framework/Apache-Test/lib/Apache TestMM.pm TestRun.pm
  Log:
  add support for 'make test TEST_VERBOSE=1 "TEST_FILES=foo bar"
  
  Revision  Changes    Path
  1.23      +4 -1      httpd-test/perl-framework/Apache-Test/lib/Apache/TestMM.pm
  
  Index: TestMM.pm
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestMM.pm,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- TestMM.pm	26 Mar 2003 07:11:34 -0000	1.22
  +++ TestMM.pm	26 Mar 2003 07:35:33 -0000	1.23
  @@ -44,6 +44,9 @@
   EOF
   
       return $preamble . <<'EOF';
  +TEST_VERBOSE = 0
  +TEST_FILES =
  +
   test_clean :
   	$(FULLPERL) -I$(INST_ARCHLIB) -I$(INST_LIB) \
   	t/TEST -clean
  @@ -51,7 +54,7 @@
   run_tests : test_clean
   	$(PASSENV) \
   	$(FULLPERL) -I$(INST_ARCHLIB) -I$(INST_LIB) \
  -	t/TEST
  +	t/TEST -verbose=$(TEST_VERBOSE) $(TEST_FILES)
   
   test :: pure_all run_tests test_clean
   
  
  
  
  1.103     +4 -2      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.102
  retrieving revision 1.103
  diff -u -r1.102 -r1.103
  --- TestRun.pm	26 Mar 2003 07:11:34 -0000	1.102
  +++ TestRun.pm	26 Mar 2003 07:35:33 -0000	1.103
  @@ -23,7 +23,8 @@
   my %original_t_perms = ();
   
   my @std_run      = qw(start-httpd run-tests stop-httpd);
  -my @others       = qw(verbose configure clean help ssl http11);
  +my @others       = qw(configure clean help ssl http11);
  +my @verbose_opts = qw(verbose);
   my @flag_opts    = (@std_run, @others);
   my @string_opts  = qw(order trace);
   my @ostring_opts = qw(proxy ping);
  @@ -41,7 +42,7 @@
      'times=N'         => 'repeat the tests N times',
      'order=mode'      => 'run the tests in one of the modes: (repeat|rotate|random|SEED)',
      'stop-httpd'      => 'stop the test server',
  -   'verbose'         => 'verbose output',
  +   'verbose[=1]'     => 'verbose output',
      'configure'       => 'force regeneration of httpd.conf (tests will not be run)',
      'clean'           => 'remove all generated test files',
      'help'            => 'display this message',
  @@ -166,6 +167,7 @@
       # 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