httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rj...@apache.org
Subject svn commit: r1774751 - in /httpd/test/framework/trunk/t: conf/extra.conf.in htdocs/modules/ext_filter/eval-cmd.pl.PL modules/ext_filter.t
Date Sat, 17 Dec 2016 12:33:46 GMT
Author: rjung
Date: Sat Dec 17 12:33:45 2016
New Revision: 1774751

URL: http://svn.apache.org/viewvc?rev=1774751&view=rev
Log:
Replace sed search-and-replace with a
perl based one, so we don't have to handle
the platform specific sed path.

The perl script still uses the
search-and-replace expression as an argument
just in case passing an argument was meant to
be part of the test. If not we can make the
script simpler and more specific.

Added:
    httpd/test/framework/trunk/t/htdocs/modules/ext_filter/eval-cmd.pl.PL   (with props)
Modified:
    httpd/test/framework/trunk/t/conf/extra.conf.in
    httpd/test/framework/trunk/t/modules/ext_filter.t

Modified: httpd/test/framework/trunk/t/conf/extra.conf.in
URL: http://svn.apache.org/viewvc/httpd/test/framework/trunk/t/conf/extra.conf.in?rev=1774751&r1=1774750&r2=1774751&view=diff
==============================================================================
--- httpd/test/framework/trunk/t/conf/extra.conf.in (original)
+++ httpd/test/framework/trunk/t/conf/extra.conf.in Sat Dec 17 12:33:45 2016
@@ -1066,8 +1066,8 @@ LimitRequestFields    32
 #
 <IfDefine APACHE2>
   <IfModule mod_ext_filter.c>
-    ExtFilterDefine foo-to-bar mode=output cmd="/usr/bin/sed s,foo,bar,g"
-    ExtFilterDefine ifoo-to-bar mode=input cmd="/usr/bin/sed s,foo,bar,g"
+    ExtFilterDefine foo-to-bar mode=output cmd="@SERVERROOT@/htdocs/modules/ext_filter/eval-cmd.pl
s,foo,bar,g"
+    ExtFilterDefine ifoo-to-bar mode=input cmd="@SERVERROOT@/htdocs/modules/ext_filter/eval-cmd.pl
s,foo,bar,g"
     ExtFilterDefine sleepy-cat-out mode=output cmd=@SERVERROOT@/htdocs/modules/ext_filter/sleepycat.pl
     ExtFilterDefine sleepy-cat-in mode=input cmd=@SERVERROOT@/htdocs/modules/ext_filter/sleepycat.pl
     AliasMatch /apache/extfilter/[^/]+/(.*) @DocumentRoot@/$1

Added: httpd/test/framework/trunk/t/htdocs/modules/ext_filter/eval-cmd.pl.PL
URL: http://svn.apache.org/viewvc/httpd/test/framework/trunk/t/htdocs/modules/ext_filter/eval-cmd.pl.PL?rev=1774751&view=auto
==============================================================================
--- httpd/test/framework/trunk/t/htdocs/modules/ext_filter/eval-cmd.pl.PL (added)
+++ httpd/test/framework/trunk/t/htdocs/modules/ext_filter/eval-cmd.pl.PL Sat Dec 17 12:33:45
2016
@@ -0,0 +1,6 @@
+use strict;
+
+$| = 1;
+
+my $cmd = shift;
+do {eval $cmd; print } while <>;

Propchange: httpd/test/framework/trunk/t/htdocs/modules/ext_filter/eval-cmd.pl.PL
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpd/test/framework/trunk/t/htdocs/modules/ext_filter/eval-cmd.pl.PL
------------------------------------------------------------------------------
    svn:executable = *

Modified: httpd/test/framework/trunk/t/modules/ext_filter.t
URL: http://svn.apache.org/viewvc/httpd/test/framework/trunk/t/modules/ext_filter.t?rev=1774751&r1=1774750&r2=1774751&view=diff
==============================================================================
--- httpd/test/framework/trunk/t/modules/ext_filter.t (original)
+++ httpd/test/framework/trunk/t/modules/ext_filter.t Sat Dec 17 12:33:45 2016
@@ -13,10 +13,6 @@ my $tests = 4 + $iters * 2;
 plan tests => $tests, need 
     need_module('ext_filter'), need_cgi;
 
-if (Apache::TestConfig::WINFU() || ! -x "/usr/bin/sed") {
-    skip "needs Unix and executable /usr/bin/sed" foreach 1..$tests; exit;
-}
-
 my $content = GET_BODY("/apache/extfilter/out-foo/foobar.html");
 chomp $content;
 ok t_cmp($content, "barbar", "sed output filter");



Mime
View raw message