runtests: add support for single-quoted attributes, use it
No binary (build failed)
—
(log yok)
| @@ -3,7 +3,6 @@ | |
| <keywords> | |
| HTTP | |
| HTTP FORMPOST | |
| - | notxml |
| </keywords> | |
| </info> | |
| # Server-side | |
| @@ -37,7 +36,7 @@ http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER | |
| -F 'file3=@"%LOGDIR/test%TESTNUMBER\".txt";type=m/f,"%LOGDIR/test%TESTNUMBER\".txt"' | |
| </command> | |
| # We create this file before the command is invoked! | |
| - | <file name=%LOGDIR/test%TESTNUMBER".txt> |
| + | <file name='%LOGDIR/test%TESTNUMBER".txt'> |
| foo bar | |
| This is a bar foo | |
| bar | |
| @@ -3,7 +3,6 @@ | |
| <keywords> | |
| HTTP | |
| HTTP FORMPOST | |
| - | notxml |
| </keywords> | |
| </info> | |
| # Server-side | |
| @@ -37,7 +36,7 @@ http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER --form-escape | |
| -F 'file3=@"%LOGDIR/test%TESTNUMBER\".txt";type=m/f,"%LOGDIR/test%TESTNUMBER\".txt"' | |
| </command> | |
| # We create this file before the command is invoked! | |
| - | <file name=%LOGDIR/test%TESTNUMBER".txt> |
| + | <file name='%LOGDIR/test%TESTNUMBER".txt'> |
| foo bar | |
| This is a bar foo | |
| bar | |
| @@ -76,9 +76,10 @@ sub testcaseattr { | |
| for(@xml) { | |
| if(($_ =~ /^ *\<testcase ([^>]*)/)) { | |
| my $attr=$1; | |
| - | while($attr =~ s/ *([^=]*)= *(\"([^\"]*)\"|([^\> ]*))//) { |
| + | while($attr =~ s/ *([^=]*)= *(\"([^\"]*)\"|\'([^\']*)\')//) { |
| my ($var, $cont)=($1, $2); | |
| $cont =~ s/^\"(.*)\"$/$1/; | |
| + | $cont =~ s/^\'(.*)\'$/$1/; |
| $hash{$var}=$cont; | |
| } | |
| } | |
| @@ -108,9 +109,10 @@ sub getpartattr { | |
| $inside++; | |
| my $attr=$1; | |
| - | while($attr =~ s/ *([^=]*)= *(\"([^\"]*)\"|([^\> ]*))//) { |
| + | while($attr =~ s/ *([^=]*)= *(\"([^\"]*)\"|\'([^\']*)\')//) { |
| my ($var, $cont)=($1, $2); | |
| $cont =~ s/^\"(.*)\"$/$1/; | |
| + | $cont =~ s/^\'(.*)\'$/$1/; |
| $hash{$var}=$cont; | |
| } | |
| last; | |