From 23965cdc0d2976fc16a00393c786d29a951a80d0 Mon Sep 17 00:00:00 2001 From: Andrew McMillan Date: Sun, 17 Dec 2006 22:00:40 +1300 Subject: [PATCH] Allow pattern replacement of output fields to be specified. --- testing/dav_test | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/testing/dav_test b/testing/dav_test index f68dc410..50096424 100755 --- a/testing/dav_test +++ b/testing/dav_test @@ -62,6 +62,7 @@ my $sql_variable = ""; my $sql_statement = ""; my $sql_values = {}; my $queries = (); +my $replacements = (); open( TEST, '<', "tests/$suite/$test.test" ) or die "Can't open 'tests/$suite/$test.test'"; while( ) { @@ -125,6 +126,13 @@ while( ) { $state = "SQL"; }; + $line =~ /^REPLACE\s*=\s*(\S)(.*)$/ && do { + my $separator = $1; + $2 =~ /^([^$separator]*)$separator([^$separator]*)$separator$/ && do { + push @$replacements, { 'pattern' => $1, 'replacement' => $2 }; + }; + }; + $line =~ /^QUERY\s*$/ && do { $sql_statement = ""; $state = "QUERY"; @@ -180,7 +188,11 @@ print STDERR join " ", "curl", @arguments, "\n" if ( $debug ); open RESULTS, "-|", "curl", @arguments; while( ) { - print; + my $line = $_; + foreach my $replacement ( @$replacements ) { + $line =~ s/$replacement->{'pattern'}/$replacement->{'replacement'}/; + } + print $line; } if ( defined(@{$queries}) && @{$queries} ) {