httpd-test-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From n.@apache.org
Subject cvs commit: httpd-test/perl-framework/t/modules include.t
Date Tue, 12 Aug 2003 12:49:35 GMT
nd          2003/08/12 05:49:35

  Modified:    perl-framework/t/modules include.t
  Added:       perl-framework/t/htdocs/modules/include if10a.shtml
                        if8a.shtml if9a.shtml
  Log:
  fix include testsuite for 1.3. Some files are not parsable in 1.3 since
  single directives require a space before end_seq. (e.g. <!--#endif -->).
  Additionally errmsg4.shtml doesn't throw an error message. Perhaps we
  should skip this in 1.3? (adjusted expectation for now)
  
  Revision  Changes    Path
  1.1                  httpd-test/perl-framework/t/htdocs/modules/include/if10a.shtml
  
  Index: if10a.shtml
  ===================================================================
  <!--#if expr="1=1" -->
  pass
  <!--#else -->
  fail
  <!--#if expr="2=2" -->
  fail
  <!--#else -->
  fail
  <!--#endif -->
  <!--#endif -->
  
  
  
  1.1                  httpd-test/perl-framework/t/htdocs/modules/include/if8a.shtml
  
  Index: if8a.shtml
  ===================================================================
  <!--#set var="x_p_ssl" value="1"-->
  <!--#set var="x_SERVER_PORT" value="443"-->
  <!--#if expr="($x_SERVER_PORT = 80) && ($x_p_ssl = 0)"-->
  pass
  <!--#elif expr="($x_SERVER_PORT = 443) && ($x_p_ssl = 1)"-->
  pass
  <!--#else -->
  fail
  <!--#endif -->
  
  
  
  1.1                  httpd-test/perl-framework/t/htdocs/modules/include/if9a.shtml
  
  Index: if9a.shtml
  ===================================================================
  <!--#set var="x" value="foo bar"-->
  <!--#if expr="$x = /^foo/ && $x = /bar$/" -->
  pass
  <!--#else -->
  fail
  <!--#endif -->
  <!--#if expr="($x = /^foo/) && ($x = /bar$/)" -->
  pass
  <!--#else -->
  fail
  <!--#endif -->
  
  
  
  1.30      +13 -4     httpd-test/perl-framework/t/modules/include.t
  
  Index: include.t
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/t/modules/include.t,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- include.t	7 Aug 2003 21:32:26 -0000	1.29
  +++ include.t	12 Aug 2003 12:49:35 -0000	1.30
  @@ -38,15 +38,12 @@
   "errmsg1.shtml"         =>    "errmsg",
   "errmsg2.shtml"         =>    "errmsg",
   "errmsg3.shtml"         =>    "errmsg",
  -"errmsg4.shtml"         =>    "pass errmsg",
  +"errmsg4.shtml"         =>    $have_apache_2 ? "pass errmsg" : "pass",
   "if1.shtml"             =>    "pass",
   "if2.shtml"             =>    "pass   pass",
   "if3.shtml"             =>    "pass   pass   pass",
   "if4.shtml"             =>    "pass   pass",
   "if5.shtml"             =>    "pass  pass  pass",
  -"if8.shtml"             =>    "pass",
  -"if9.shtml"             =>    "pass   pass",
  -"if10.shtml"            =>    "pass",
   "big.shtml"             =>    "hello   pass  pass   pass     hello",
   "newline.shtml"         =>    "inc-two.shtml body",
   "inc-rfile.shtml"       =>
  @@ -67,6 +64,18 @@
       delete $test{'exec/on/cmd.shtml'};
   }
   
  +# 1.3 gets slightly modified versions, since it cannot parse some files
  +# written for 2.x (requires spaces before end_seq)
  +if ($have_apache_2) {
  +    $test{"if8.shtml"}  = "pass";
  +    $test{"if9.shtml"}  = "pass   pass";
  +    $test{"if10.shtml"} = "pass";
  +}
  +else {
  +    $test{"if8a.shtml"}  = "pass";
  +    $test{"if9a.shtml"}  = "pass   pass";
  +    $test{"if10a.shtml"} = "pass";
  +}
   
   #
   # in addition to $tests, there are 1 GET test, 9 XBitHack tests,
  
  
  

Mime
View raw message