httpd-test-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ge...@apache.org
Subject cvs commit: httpd-test/perl-framework/t/php add.t all.t arg.t cfunctions.t classes.t construct.t dirname.t divide.t do-while.t else.t elseif.t eval.t eval2.t eval3.t eval4.t func1.t func2.t func3.t func4.t func5.t func6.t getenv.t getlastmod.t globals.t hello.t if.t if2.t ifmodsince.t include.t include2.t inheritance.t multiply.t nestif.t ops.t param.t param2.t recurse.t regression.t regression2.t regression3.t stack.t strings.t strings2.t strings3.t strings4.t subtract.t switch.t switch2.t switch3.t switch4.t umask.t var1.t var2.t var3.t while.t
Date Wed, 04 Aug 2004 15:29:20 GMT
geoff       2004/08/04 08:29:20

  Modified:    perl-framework/t/conf extra.conf.in
               perl-framework/t/php add.t all.t arg.t cfunctions.t
                        classes.t construct.t dirname.t divide.t do-while.t
                        else.t elseif.t eval.t eval2.t eval3.t eval4.t
                        func1.t func2.t func3.t func4.t func5.t func6.t
                        getenv.t getlastmod.t globals.t hello.t if.t if2.t
                        ifmodsince.t include.t include2.t inheritance.t
                        multiply.t nestif.t ops.t param.t param2.t
                        recurse.t regression.t regression2.t regression3.t
                        stack.t strings.t strings2.t strings3.t strings4.t
                        subtract.t switch.t switch2.t switch3.t switch4.t
                        umask.t var1.t var2.t var3.t while.t
  Log:
  change from have_module 'php4' to need_php, except where the tests
  fail under php5, in which case have_module was changed to need_module.
  
  also, update extra.conf.in to @PHP_MODULE@ so the right php module is
  selected
  
  Revision  Changes    Path
  1.49      +2 -2      httpd-test/perl-framework/t/conf/extra.conf.in
  
  Index: extra.conf.in
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/t/conf/extra.conf.in,v
  retrieving revision 1.48
  retrieving revision 1.49
  diff -u -r1.48 -r1.49
  --- extra.conf.in	18 May 2004 12:22:04 -0000	1.48
  +++ extra.conf.in	4 Aug 2004 15:29:13 -0000	1.49
  @@ -33,10 +33,10 @@
   </IfDefine>
   
   ##
  -## mod_php4 test config
  +## mod_php4/mod_php5 test config
   ##
   
  -<IfModule mod_php4.c>
  +<IfModule @PHP_MODULE@>
       AddType application/x-httpd-php .php
       AddType application/x-httpd-php-source .phps
   </IfModule>
  
  
  
  1.5       +1 -1      httpd-test/perl-framework/t/php/add.t
  
  Index: add.t
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/t/php/add.t,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- add.t	18 Sep 2001 15:41:03 -0000	1.4
  +++ add.t	4 Aug 2004 15:29:13 -0000	1.5
  @@ -4,7 +4,7 @@
   use Apache::Test;
   use Apache::TestRequest;
   
  -plan tests => 1, have_module 'php4';
  +plan tests => 1, need_php;
   
   ## add.php source:
   ## <?php $a=1; $b=2; $c=3; $d=$a+$b+$c; echo $d?>
  
  
  
  1.3       +1 -1      httpd-test/perl-framework/t/php/all.t
  
  Index: all.t
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/t/php/all.t,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- all.t	18 Sep 2001 15:41:03 -0000	1.2
  +++ all.t	4 Aug 2004 15:29:13 -0000	1.3
  @@ -4,6 +4,6 @@
   use Apache::Test;
   
   #skip all tests in this directory unless php4 module is enabled
  -plan tests => 1, have_module 'php4';
  +plan tests => 1, need_php;
   
   ok 1;
  
  
  
  1.6       +1 -1      httpd-test/perl-framework/t/php/arg.t
  
  Index: arg.t
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/t/php/arg.t,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- arg.t	9 May 2002 22:20:31 -0000	1.5
  +++ arg.t	4 Aug 2004 15:29:13 -0000	1.6
  @@ -5,7 +5,7 @@
   use Apache::TestRequest;
   use Apache::TestUtil;
   
  -plan tests => 1, have_module 'php4';
  +plan tests => 1, need_php;
   
   ## arg.php source:
   ## <?php
  
  
  
  1.5       +1 -1      httpd-test/perl-framework/t/php/cfunctions.t
  
  Index: cfunctions.t
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/t/php/cfunctions.t,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- cfunctions.t	18 Sep 2001 15:41:03 -0000	1.4
  +++ cfunctions.t	4 Aug 2004 15:29:13 -0000	1.5
  @@ -4,7 +4,7 @@
   use Apache::Test;
   use Apache::TestRequest;
   
  -plan tests => 1, have_module 'php4';
  +plan tests => 1, need_php;
   
   my $expected = <<EXPECT;
   0
  
  
  
  1.5       +1 -1      httpd-test/perl-framework/t/php/classes.t
  
  Index: classes.t
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/t/php/classes.t,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- classes.t	18 Sep 2001 15:41:03 -0000	1.4
  +++ classes.t	4 Aug 2004 15:29:13 -0000	1.5
  @@ -4,7 +4,7 @@
   use Apache::Test;
   use Apache::TestRequest;
   
  -plan tests => 1, have_module 'php4';
  +plan tests => 1, need_php;
   
   my $expected = <<EXPECT;
   User information
  
  
  
  1.5       +1 -1      httpd-test/perl-framework/t/php/construct.t
  
  Index: construct.t
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/t/php/construct.t,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- construct.t	18 Sep 2001 15:41:03 -0000	1.4
  +++ construct.t	4 Aug 2004 15:29:13 -0000	1.5
  @@ -4,7 +4,7 @@
   use Apache::Test;
   use Apache::TestRequest;
   
  -plan tests => 2, have_module 'php4';
  +plan tests => 2, need_module 'php4';
   
   ## testing PHP OO bug (#7515)
   ## php src:
  
  
  
  1.5       +1 -1      httpd-test/perl-framework/t/php/dirname.t
  
  Index: dirname.t
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/t/php/dirname.t,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- dirname.t	18 Sep 2001 15:41:03 -0000	1.4
  +++ dirname.t	4 Aug 2004 15:29:13 -0000	1.5
  @@ -4,7 +4,7 @@
   use Apache::Test;
   use Apache::TestRequest;
   
  -plan tests => 1, have_module 'php4';
  +plan tests => 1, need_php;
   
   ## dirname.php source:
   ## <?php
  
  
  
  1.5       +1 -1      httpd-test/perl-framework/t/php/divide.t
  
  Index: divide.t
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/t/php/divide.t,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- divide.t	18 Sep 2001 15:41:03 -0000	1.4
  +++ divide.t	4 Aug 2004 15:29:13 -0000	1.5
  @@ -4,7 +4,7 @@
   use Apache::Test;
   use Apache::TestRequest;
   
  -plan tests => 1, have_module 'php4';
  +plan tests => 1, need_php;
   
   ## divide.php source:
   ## <?php $a=27; $b=3; $c=3; $d=$a/$b/$c; echo $d?>
  
  
  
  1.5       +1 -1      httpd-test/perl-framework/t/php/do-while.t
  
  Index: do-while.t
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/t/php/do-while.t,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- do-while.t	18 Sep 2001 15:41:03 -0000	1.4
  +++ do-while.t	4 Aug 2004 15:29:13 -0000	1.5
  @@ -4,7 +4,7 @@
   use Apache::Test;
   use Apache::TestRequest;
   
  -plan tests => 1, have_module 'php4';
  +plan tests => 1, need_php;
   
   my $expected = "321";
   
  
  
  
  1.5       +1 -1      httpd-test/perl-framework/t/php/else.t
  
  Index: else.t
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/t/php/else.t,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- else.t	18 Sep 2001 15:41:03 -0000	1.4
  +++ else.t	4 Aug 2004 15:29:13 -0000	1.5
  @@ -4,7 +4,7 @@
   use Apache::Test;
   use Apache::TestRequest;
   
  -plan tests => 1, have_module 'php4';
  +plan tests => 1, need_php;
   
   my $result = GET_BODY "/php/else.php";
   ok $result eq "good\n";
  
  
  
  1.5       +1 -1      httpd-test/perl-framework/t/php/elseif.t
  
  Index: elseif.t
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/t/php/elseif.t,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- elseif.t	18 Sep 2001 15:41:03 -0000	1.4
  +++ elseif.t	4 Aug 2004 15:29:13 -0000	1.5
  @@ -4,7 +4,7 @@
   use Apache::Test;
   use Apache::TestRequest;
   
  -plan tests => 1, have_module 'php4';
  +plan tests => 1, need_php;
   
   my $result = GET_BODY "/php/elseif.php";
   ok $result eq "good\n";
  
  
  
  1.5       +1 -1      httpd-test/perl-framework/t/php/eval.t
  
  Index: eval.t
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/t/php/eval.t,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- eval.t	18 Sep 2001 15:41:03 -0000	1.4
  +++ eval.t	4 Aug 2004 15:29:13 -0000	1.5
  @@ -6,7 +6,7 @@
   
   ## testing eval function
   
  -plan tests => 1, have_module 'php4';
  +plan tests => 1, need_php;
   
   my $expected = "Hello";
   
  
  
  
  1.5       +1 -1      httpd-test/perl-framework/t/php/eval2.t
  
  Index: eval2.t
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/t/php/eval2.t,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- eval2.t	18 Sep 2001 15:41:03 -0000	1.4
  +++ eval2.t	4 Aug 2004 15:29:13 -0000	1.5
  @@ -6,7 +6,7 @@
   
   ## testing eval function inside user function
   
  -plan tests => 1, have_module 'php4';
  +plan tests => 1, need_module 'php4';
   
   my $expected = "Hello";
   
  
  
  
  1.5       +1 -1      httpd-test/perl-framework/t/php/eval3.t
  
  Index: eval3.t
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/t/php/eval3.t,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- eval3.t	18 Sep 2001 15:41:03 -0000	1.4
  +++ eval3.t	4 Aug 2004 15:29:13 -0000	1.5
  @@ -6,7 +6,7 @@
   
   ## testing eval function
   
  -plan tests => 1, have_module 'php4';
  +plan tests => 1, need_php;
   
   my $expected = <<EXPECT;
   hey
  
  
  
  1.5       +1 -1      httpd-test/perl-framework/t/php/eval4.t
  
  Index: eval4.t
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/t/php/eval4.t,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- eval4.t	18 Sep 2001 15:41:03 -0000	1.4
  +++ eval4.t	4 Aug 2004 15:29:13 -0000	1.5
  @@ -6,7 +6,7 @@
   
   ## testing eval function
   
  -plan tests => 1, have_module 'php4';
  +plan tests => 1, need_php;
   
   my $expected = <<EXPECT;
   hey, this is a regular echo'd eval()
  
  
  
  1.5       +1 -1      httpd-test/perl-framework/t/php/func1.t
  
  Index: func1.t
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/t/php/func1.t,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- func1.t	18 Sep 2001 15:41:03 -0000	1.4
  +++ func1.t	4 Aug 2004 15:29:13 -0000	1.5
  @@ -4,7 +4,7 @@
   use Apache::Test;
   use Apache::TestRequest;
   
  -plan tests => 1, have_module 'php4';
  +plan tests => 1, need_php;
   
   ## func1.php source:
   ## <?php echo strlen("abcdef")?>
  
  
  
  1.5       +1 -1      httpd-test/perl-framework/t/php/func2.t
  
  Index: func2.t
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/t/php/func2.t,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- func2.t	18 Sep 2001 15:41:03 -0000	1.4
  +++ func2.t	4 Aug 2004 15:29:13 -0000	1.5
  @@ -4,7 +4,7 @@
   use Apache::Test;
   use Apache::TestRequest;
   
  -plan tests => 1, have_module 'php4';
  +plan tests => 1, need_module 'php4';
   
   my $expected = <<EXPECT;
   hey=0, 0
  
  
  
  1.5       +1 -1      httpd-test/perl-framework/t/php/func3.t
  
  Index: func3.t
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/t/php/func3.t,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- func3.t	18 Sep 2001 15:41:03 -0000	1.4
  +++ func3.t	4 Aug 2004 15:29:13 -0000	1.5
  @@ -4,7 +4,7 @@
   use Apache::Test;
   use Apache::TestRequest;
   
  -plan tests => 1, have_module 'php4';
  +plan tests => 1, need_module 'php4';
   
   my $expected = <<EXPECT;
   hey
  
  
  
  1.5       +1 -1      httpd-test/perl-framework/t/php/func4.t
  
  Index: func4.t
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/t/php/func4.t,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- func4.t	18 Sep 2001 15:41:03 -0000	1.4
  +++ func4.t	4 Aug 2004 15:29:13 -0000	1.5
  @@ -4,7 +4,7 @@
   use Apache::Test;
   use Apache::TestRequest;
   
  -plan tests => 1, have_module 'php4';
  +plan tests => 1, need_module 'php4';
   
   my $expected = <<EXPECT;
   Before function declaration...
  
  
  
  1.12      +1 -1      httpd-test/perl-framework/t/php/func5.t
  
  Index: func5.t
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/t/php/func5.t,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- func5.t	9 May 2002 22:20:31 -0000	1.11
  +++ func5.t	4 Aug 2004 15:29:13 -0000	1.12
  @@ -5,7 +5,7 @@
   use Apache::TestRequest;
   use Apache::TestUtil;
   
  -plan tests => 2, have_module 'php4';
  +plan tests => 2, need_php;
   
   my $path = Apache::Test::vars()->{t_logs};
   my $file = "$path/func5.php.ran";
  
  
  
  1.5       +1 -1      httpd-test/perl-framework/t/php/func6.t
  
  Index: func6.t
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/t/php/func6.t,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- func6.t	18 Sep 2001 15:41:03 -0000	1.4
  +++ func6.t	4 Aug 2004 15:29:14 -0000	1.5
  @@ -6,7 +6,7 @@
   
   ## nested functions test.
   
  -plan tests => 1, have_module 'php4';
  +plan tests => 1, need_php;
   
   my $expected = "4 Hello 4";
   
  
  
  
  1.2       +1 -1      httpd-test/perl-framework/t/php/getenv.t
  
  Index: getenv.t
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/t/php/getenv.t,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- getenv.t	11 Feb 2003 19:44:15 -0000	1.1
  +++ getenv.t	4 Aug 2004 15:29:14 -0000	1.2
  @@ -5,7 +5,7 @@
   use Apache::TestRequest;
   use Apache::TestUtil;
   
  -plan tests => 1, have_module 'php4';
  +plan tests => 1, need_php;
   
   # Regression test for http://bugs.php.net/bug.php?id=19840
   
  
  
  
  1.2       +1 -1      httpd-test/perl-framework/t/php/getlastmod.t
  
  Index: getlastmod.t
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/t/php/getlastmod.t,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- getlastmod.t	9 Feb 2003 23:16:47 -0000	1.1
  +++ getlastmod.t	4 Aug 2004 15:29:14 -0000	1.2
  @@ -8,7 +8,7 @@
   
   use POSIX qw(strftime);
   
  -plan tests => 1, have_module 'php4';
  +plan tests => 1, need_php;
   
   my $vars = Apache::Test::vars();
   my $fname = catfile $vars->{documentroot}, "php", "getlastmod.php";
  
  
  
  1.5       +1 -1      httpd-test/perl-framework/t/php/globals.t
  
  Index: globals.t
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/t/php/globals.t,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- globals.t	18 Sep 2001 15:41:03 -0000	1.4
  +++ globals.t	4 Aug 2004 15:29:14 -0000	1.5
  @@ -4,7 +4,7 @@
   use Apache::Test;
   use Apache::TestRequest;
   
  -plan tests => 1, have_module 'php4';
  +plan tests => 1, need_php;
   
   my $result = GET_BODY "/php/globals.php";
   ok $result eq "1 5 2 2 10 5  2 5 3 2 10 5  3 5 4 2 \n";
  
  
  
  1.5       +1 -1      httpd-test/perl-framework/t/php/hello.t
  
  Index: hello.t
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/t/php/hello.t,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- hello.t	18 Sep 2001 15:41:03 -0000	1.4
  +++ hello.t	4 Aug 2004 15:29:14 -0000	1.5
  @@ -4,7 +4,7 @@
   use Apache::Test;
   use Apache::TestRequest;
   
  -plan tests => 1, have_module 'php4';
  +plan tests => 1, need_php;
   
   ## hello.php source:
   ## <?php echo "Hello World"?>
  
  
  
  1.5       +1 -1      httpd-test/perl-framework/t/php/if.t
  
  Index: if.t
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/t/php/if.t,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- if.t	18 Sep 2001 15:41:03 -0000	1.4
  +++ if.t	4 Aug 2004 15:29:14 -0000	1.5
  @@ -4,7 +4,7 @@
   use Apache::Test;
   use Apache::TestRequest;
   
  -plan tests => 1, have_module 'php4';
  +plan tests => 1, need_php;
   
   my $result = GET_BODY "/php/if.php";
   ok $result eq 'Yes';
  
  
  
  1.5       +1 -1      httpd-test/perl-framework/t/php/if2.t
  
  Index: if2.t
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/t/php/if2.t,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- if2.t	18 Sep 2001 15:41:03 -0000	1.4
  +++ if2.t	4 Aug 2004 15:29:14 -0000	1.5
  @@ -6,7 +6,7 @@
   
   ## Testing user-defined function falling out of an If into another
   
  -plan tests => 1, have_module 'php4';
  +plan tests => 1, need_module 'php4';
   
   my $expected = "1\n";
   
  
  
  
  1.2       +1 -1      httpd-test/perl-framework/t/php/ifmodsince.t
  
  Index: ifmodsince.t
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/t/php/ifmodsince.t,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ifmodsince.t	9 Feb 2003 23:16:02 -0000	1.1
  +++ ifmodsince.t	4 Aug 2004 15:29:14 -0000	1.2
  @@ -7,7 +7,7 @@
   
   use POSIX qw(strftime);
   
  -plan tests => 1, have_module 'php4';
  +plan tests => 1, need_php;
   
   # Test for bug where Apache serves a 304 if the PHP file (on disk) has
   # not been modified since the date given in an If-Modified-Since
  
  
  
  1.5       +1 -1      httpd-test/perl-framework/t/php/include.t
  
  Index: include.t
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/t/php/include.t,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- include.t	18 Sep 2001 15:41:03 -0000	1.4
  +++ include.t	4 Aug 2004 15:29:14 -0000	1.5
  @@ -6,7 +6,7 @@
   
   ## testing include
   
  -plan tests => 1, have_module 'php4';
  +plan tests => 1, need_php;
   
   my $expected = "Hello";
   
  
  
  
  1.5       +1 -1      httpd-test/perl-framework/t/php/include2.t
  
  Index: include2.t
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/t/php/include2.t,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- include2.t	18 Sep 2001 15:41:03 -0000	1.4
  +++ include2.t	4 Aug 2004 15:29:14 -0000	1.5
  @@ -6,7 +6,7 @@
   
   ## testing user function in an nclude
   
  -plan tests => 1, have_module 'php4';
  +plan tests => 1, need_module 'php4';
   
   my $expected = "Hello";
   
  
  
  
  1.5       +1 -1      httpd-test/perl-framework/t/php/inheritance.t
  
  Index: inheritance.t
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/t/php/inheritance.t,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- inheritance.t	18 Sep 2001 15:41:03 -0000	1.4
  +++ inheritance.t	4 Aug 2004 15:29:14 -0000	1.5
  @@ -4,7 +4,7 @@
   use Apache::Test;
   use Apache::TestRequest;
   
  -plan tests => 1, have_module 'php4';
  +plan tests => 1, need_php;
   
   my $expected = <<EXPECT;
   This is class foo
  
  
  
  1.5       +1 -1      httpd-test/perl-framework/t/php/multiply.t
  
  Index: multiply.t
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/t/php/multiply.t,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- multiply.t	18 Sep 2001 15:41:03 -0000	1.4
  +++ multiply.t	4 Aug 2004 15:29:14 -0000	1.5
  @@ -4,7 +4,7 @@
   use Apache::Test;
   use Apache::TestRequest;
   
  -plan tests => 1, have_module 'php4';
  +plan tests => 1, need_php;
   
   ## multiply.php source:
   ## <?php $a=2; $b=4; $c=8; $d=$a*$b*$c; echo $d?>
  
  
  
  1.5       +1 -1      httpd-test/perl-framework/t/php/nestif.t
  
  Index: nestif.t
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/t/php/nestif.t,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- nestif.t	18 Sep 2001 15:41:03 -0000	1.4
  +++ nestif.t	4 Aug 2004 15:29:14 -0000	1.5
  @@ -4,7 +4,7 @@
   use Apache::Test;
   use Apache::TestRequest;
   
  -plan tests => 1, have_module 'php4';
  +plan tests => 1, need_php;
   
   my $result = GET_BODY "/php/nestif.php";
   ok $result eq "good\n";
  
  
  
  1.5       +1 -1      httpd-test/perl-framework/t/php/ops.t
  
  Index: ops.t
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/t/php/ops.t,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ops.t	18 Sep 2001 15:41:03 -0000	1.4
  +++ ops.t	4 Aug 2004 15:29:14 -0000	1.5
  @@ -4,7 +4,7 @@
   use Apache::Test;
   use Apache::TestRequest;
   
  -plan tests => 1, have_module 'php4';
  +plan tests => 1, need_php;
   
   ## ops.php source:
   ## <?php $a=8; $b=4; $c=8; echo $a|$b&$c?>
  
  
  
  1.5       +1 -1      httpd-test/perl-framework/t/php/param.t
  
  Index: param.t
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/t/php/param.t,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- param.t	18 Sep 2001 15:41:03 -0000	1.4
  +++ param.t	4 Aug 2004 15:29:14 -0000	1.5
  @@ -4,7 +4,7 @@
   use Apache::Test;
   use Apache::TestRequest;
   
  -plan tests => 1, have_module 'php4';
  +plan tests => 1, need_module 'php4';
   
   my $result = GET_BODY "/php/param.php";
   ok $result eq "3\n";
  
  
  
  1.5       +1 -1      httpd-test/perl-framework/t/php/param2.t
  
  Index: param2.t
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/t/php/param2.t,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- param2.t	18 Sep 2001 15:41:03 -0000	1.4
  +++ param2.t	4 Aug 2004 15:29:14 -0000	1.5
  @@ -4,7 +4,7 @@
   use Apache::Test;
   use Apache::TestRequest;
   
  -plan tests => 1, have_module 'php4';
  +plan tests => 1, need_module 'php4';
   
   my $result = GET_BODY "/php/param2.php";
   ok $result eq "2\n";
  
  
  
  1.5       +1 -1      httpd-test/perl-framework/t/php/recurse.t
  
  Index: recurse.t
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/t/php/recurse.t,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- recurse.t	18 Sep 2001 15:41:03 -0000	1.4
  +++ recurse.t	4 Aug 2004 15:29:14 -0000	1.5
  @@ -4,7 +4,7 @@
   use Apache::Test;
   use Apache::TestRequest;
   
  -plan tests => 1, have_module 'php4';
  +plan tests => 1, need_php;
   
   my $result = GET_BODY "/php/recurse.php";
   ok $result eq "1 2 3 4 5 6 7 8 9 \n";
  
  
  
  1.5       +1 -1      httpd-test/perl-framework/t/php/regression.t
  
  Index: regression.t
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/t/php/regression.t,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- regression.t	18 Sep 2001 15:41:03 -0000	1.4
  +++ regression.t	4 Aug 2004 15:29:14 -0000	1.5
  @@ -4,7 +4,7 @@
   use Apache::Test;
   use Apache::TestRequest;
   
  -plan tests => 1, have_module 'php4';
  +plan tests => 1, need_php;
   
   my $expected = <<EXPECT;
   PHP Regression Test
  
  
  
  1.5       +1 -1      httpd-test/perl-framework/t/php/regression2.t
  
  Index: regression2.t
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/t/php/regression2.t,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- regression2.t	18 Sep 2001 15:41:03 -0000	1.4
  +++ regression2.t	4 Aug 2004 15:29:14 -0000	1.5
  @@ -4,7 +4,7 @@
   use Apache::Test;
   use Apache::TestRequest;
   
  -plan tests => 1, have_module 'php4';
  +plan tests => 1, need_php;
   
   my $expected = <<EXPECT;
   <html>
  
  
  
  1.5       +1 -1      httpd-test/perl-framework/t/php/regression3.t
  
  Index: regression3.t
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/t/php/regression3.t,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- regression3.t	18 Sep 2001 15:41:03 -0000	1.4
  +++ regression3.t	4 Aug 2004 15:29:14 -0000	1.5
  @@ -4,7 +4,7 @@
   use Apache::Test;
   use Apache::TestRequest;
   
  -plan tests => 1, have_module 'php4';
  +plan tests => 1, need_module 'php4';
   
   my $expected = <<EXPECT;
    0  a  1  a  2  a  3  a  4  a  5  a  6  a  7  a  8  a  9 
  
  
  
  1.5       +1 -1      httpd-test/perl-framework/t/php/stack.t
  
  Index: stack.t
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/t/php/stack.t,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- stack.t	18 Sep 2001 15:41:03 -0000	1.4
  +++ stack.t	4 Aug 2004 15:29:14 -0000	1.5
  @@ -6,7 +6,7 @@
   
   ## testing stack after early function return
   
  -plan tests => 1, have_module 'php4';
  +plan tests => 1, need_module 'php4';
   
   my $expected = "HelloHello";
   
  
  
  
  1.5       +1 -1      httpd-test/perl-framework/t/php/strings.t
  
  Index: strings.t
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/t/php/strings.t,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- strings.t	18 Sep 2001 15:41:03 -0000	1.4
  +++ strings.t	4 Aug 2004 15:29:14 -0000	1.5
  @@ -4,7 +4,7 @@
   use Apache::Test;
   use Apache::TestRequest;
   
  -plan tests => 1, have_module 'php4';
  +plan tests => 1, need_php;
   
   my $expected = "\"	\\'\\n\\'a\\\\b\\";
   
  
  
  
  1.5       +1 -1      httpd-test/perl-framework/t/php/strings2.t
  
  Index: strings2.t
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/t/php/strings2.t,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- strings2.t	18 Sep 2001 15:41:04 -0000	1.4
  +++ strings2.t	4 Aug 2004 15:29:14 -0000	1.5
  @@ -4,7 +4,7 @@
   use Apache::Test;
   use Apache::TestRequest;
   
  -plan tests => 1, have_module 'php4';
  +plan tests => 1, need_php;
   
   my $expected = <<EXPECT;
   Testing strtok: passed
  
  
  
  1.7       +1 -1      httpd-test/perl-framework/t/php/strings3.t
  
  Index: strings3.t
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/t/php/strings3.t,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- strings3.t	18 Jun 2004 09:42:16 -0000	1.6
  +++ strings3.t	4 Aug 2004 15:29:14 -0000	1.7
  @@ -9,7 +9,7 @@
   my @res = split /\n/, $result;
   my $count = @res;
   
  -plan tests => $count + 1, have_module 'php4';
  +plan tests => $count + 1, need_php;
   
   my $expected = <<EXPECT;
   printf test 1:simple string
  
  
  
  1.5       +1 -1      httpd-test/perl-framework/t/php/strings4.t
  
  Index: strings4.t
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/t/php/strings4.t,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- strings4.t	18 Sep 2001 15:41:04 -0000	1.4
  +++ strings4.t	4 Aug 2004 15:29:14 -0000	1.5
  @@ -4,7 +4,7 @@
   use Apache::Test;
   use Apache::TestRequest;
   
  -plan tests => 1, have_module 'php4';
  +plan tests => 1, need_php;
   
   my $expected = <<EXPECT;
   &lt;&gt;&quot;&amp;εΔ
  
  
  
  1.5       +1 -1      httpd-test/perl-framework/t/php/subtract.t
  
  Index: subtract.t
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/t/php/subtract.t,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- subtract.t	18 Sep 2001 15:41:04 -0000	1.4
  +++ subtract.t	4 Aug 2004 15:29:14 -0000	1.5
  @@ -4,7 +4,7 @@
   use Apache::Test;
   use Apache::TestRequest;
   
  -plan tests => 1, have_module 'php4';
  +plan tests => 1, need_php;
   
   ## subtract.php source:
   ## <?php $a=27; $b=7; $c=10; $d=$a-$b-$c; echo $d?>
  
  
  
  1.5       +1 -1      httpd-test/perl-framework/t/php/switch.t
  
  Index: switch.t
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/t/php/switch.t,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- switch.t	18 Sep 2001 15:41:04 -0000	1.4
  +++ switch.t	4 Aug 2004 15:29:14 -0000	1.5
  @@ -4,7 +4,7 @@
   use Apache::Test;
   use Apache::TestRequest;
   
  -plan tests => 1, have_module 'php4';
  +plan tests => 1, need_php;
   
   my $result = GET_BODY "/php/switch.php";
   ok $result eq "good\n";
  
  
  
  1.5       +1 -1      httpd-test/perl-framework/t/php/switch2.t
  
  Index: switch2.t
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/t/php/switch2.t,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- switch2.t	18 Sep 2001 15:41:04 -0000	1.4
  +++ switch2.t	4 Aug 2004 15:29:14 -0000	1.5
  @@ -4,7 +4,7 @@
   use Apache::Test;
   use Apache::TestRequest;
   
  -plan tests => 1, have_module 'php4';
  +plan tests => 1, need_php;
   
   my $expected = <<EXPECT;
   In branch 1
  
  
  
  1.5       +1 -1      httpd-test/perl-framework/t/php/switch3.t
  
  Index: switch3.t
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/t/php/switch3.t,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- switch3.t	18 Sep 2001 15:41:04 -0000	1.4
  +++ switch3.t	4 Aug 2004 15:29:14 -0000	1.5
  @@ -4,7 +4,7 @@
   use Apache::Test;
   use Apache::TestRequest;
   
  -plan tests => 1, have_module 'php4';
  +plan tests => 1, need_php;
   
   my $expected = <<EXPECT;
   i=0
  
  
  
  1.5       +1 -1      httpd-test/perl-framework/t/php/switch4.t
  
  Index: switch4.t
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/t/php/switch4.t,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- switch4.t	18 Sep 2001 15:41:04 -0000	1.4
  +++ switch4.t	4 Aug 2004 15:29:15 -0000	1.5
  @@ -4,7 +4,7 @@
   use Apache::Test;
   use Apache::TestRequest;
   
  -plan tests => 1, have_module 'php4';
  +plan tests => 1, need_php;
   
   my $expected = <<EXPECT;
   zero
  
  
  
  1.2       +1 -1      httpd-test/perl-framework/t/php/umask.t
  
  Index: umask.t
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/t/php/umask.t,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- umask.t	22 Apr 2004 14:31:19 -0000	1.1
  +++ umask.t	4 Aug 2004 15:29:15 -0000	1.2
  @@ -7,7 +7,7 @@
   
   ## test that umask() is reset after script execution
   
  -plan tests => 4, have_module 'php4';
  +plan tests => 4, need_module 'php4';
   
   my $first = GET_BODY "/php/umask.php";
   
  
  
  
  1.6       +1 -1      httpd-test/perl-framework/t/php/var1.t
  
  Index: var1.t
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/t/php/var1.t,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- var1.t	9 May 2002 22:07:36 -0000	1.5
  +++ var1.t	4 Aug 2004 15:29:15 -0000	1.6
  @@ -5,7 +5,7 @@
   use Apache::TestRequest;
   use Apache::TestUtil;
   
  -plan tests => 2, have_module 'php4';
  +plan tests => 2, need_php;
   
   ## var1.php source:
   ## <?php echo $variable?>
  
  
  
  1.6       +1 -1      httpd-test/perl-framework/t/php/var2.t
  
  Index: var2.t
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/t/php/var2.t,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- var2.t	9 May 2002 22:07:37 -0000	1.5
  +++ var2.t	4 Aug 2004 15:29:15 -0000	1.6
  @@ -5,7 +5,7 @@
   use Apache::TestRequest;
   use Apache::TestUtil;
   
  -plan tests => 2, have_module 'php4';
  +plan tests => 2, need_php;
   
   ## var2.php source:
   ## <?php echo "$v1 $v2"?>
  
  
  
  1.6       +1 -1      httpd-test/perl-framework/t/php/var3.t
  
  Index: var3.t
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/t/php/var3.t,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- var3.t	9 May 2002 22:07:37 -0000	1.5
  +++ var3.t	4 Aug 2004 15:29:15 -0000	1.6
  @@ -5,7 +5,7 @@
   use Apache::TestRequest;
   use Apache::TestUtil;
   
  -plan tests => 2, have_module 'php4';
  +plan tests => 2, need_php;
   
   ## var3.php source:
   ## <?php echo "$v1 $v2 $v3"?>
  
  
  
  1.5       +1 -1      httpd-test/perl-framework/t/php/while.t
  
  Index: while.t
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/t/php/while.t,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- while.t	18 Sep 2001 15:41:04 -0000	1.4
  +++ while.t	4 Aug 2004 15:29:15 -0000	1.5
  @@ -4,7 +4,7 @@
   use Apache::Test;
   use Apache::TestRequest;
   
  -plan tests => 1, have_module 'php4';
  +plan tests => 1, need_php;
   
   my $result = GET_BODY "/php/while.php";
   ok $result eq '123456789';
  
  
  

Mime
View raw message