projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Include the Privoxy version in the output
[privoxy.git]
/
tools
/
privoxy-regression-test.pl
diff --git
a/tools/privoxy-regression-test.pl
b/tools/privoxy-regression-test.pl
index
193a9b0
..
60e9d69
100755
(executable)
--- a/
tools/privoxy-regression-test.pl
+++ b/
tools/privoxy-regression-test.pl
@@
-7,7
+7,7
@@
# A regression test "framework" for Privoxy. For documentation see:
# perldoc privoxy-regression-test.pl
#
# A regression test "framework" for Privoxy. For documentation see:
# perldoc privoxy-regression-test.pl
#
-# $Id: privoxy-regression-test.pl,v 1.
79 2011/10/30 16:21:01
fabiankeil Exp $
+# $Id: privoxy-regression-test.pl,v 1.
83 2013/01/06 18:14:17
fabiankeil Exp $
#
# Wish list:
#
#
# Wish list:
#
@@
-40,7
+40,7
@@
use strict;
use Getopt::Long;
use constant {
use Getopt::Long;
use constant {
- PRT_VERSION => 'Privoxy-Regression-Test 0.
4
',
+ PRT_VERSION => 'Privoxy-Regression-Test 0.
5
',
CURL => 'curl',
CURL => 'curl',
@@
-311,6
+311,7
@@
sub load_regression_tests_through_privoxy () {
my $curl_url = '';
my $file_number = 0;
my $feature;
my $curl_url = '';
my $file_number = 0;
my $feature;
+ my $privoxy_version = '(Unknown version!)';
$curl_url .= $privoxy_cgi_url;
$curl_url .= 'show-status';
$curl_url .= $privoxy_cgi_url;
$curl_url .= 'show-status';
@@
-342,10
+343,14
@@
sub load_regression_tests_through_privoxy () {
$privoxy_features{$feature} = $1 if defined $feature;
$feature = undef;
$privoxy_features{$feature} = $1 if defined $feature;
$feature = undef;
+
+ } elsif (m@This is <a href="http://www.privoxy.org/">Privoxy</a> (\d+\.\d+\.\d+) on@) {
+ $privoxy_version = $1;
}
}
}
}
- l(LL_FILE_LOADING, "Recognized " . @actionfiles . " actions files");
+ l(LL_STATUS, "Gathering regression tests from " .
+ @actionfiles . " action file(s) delivered by Privoxy $privoxy_version.");
load_action_files(\@actionfiles);
}
load_action_files(\@actionfiles);
}
@@
-491,9
+496,6
@@
sub load_action_files ($) {
my $ignored = 0;
my $ignored = 0;
- l(LL_STATUS, "Gathering regression tests from " .
- @actionfiles . " action file(s) delivered by Privoxy.");
-
for my $file_number (0 .. @actionfiles - 1) {
my $curl_url = quote($actionfiles[$file_number]);
for my $file_number (0 .. @actionfiles - 1) {
my $curl_url = quote($actionfiles[$file_number]);
@@
-1502,7
+1504,7
@@
sub log_message ($) {
$message = $time_stamp . ": " . $message;
}
$message = $time_stamp . ": " . $message;
}
- printf(
STDERR
"%s\n", $message);
+ printf("%s\n", $message);
}
sub log_result ($$) {
}
sub log_result ($$) {
@@
-1598,7
+1600,7
@@
sub quote ($) {
}
sub print_version () {
}
sub print_version () {
- printf PRT_VERSION . "\n"
. 'Copyright (C) 2007-2011 Fabian Keil <fk@fabiankeil.de>' . "\n"
;
+ printf PRT_VERSION . "\n";
}
sub list_test_types () {
}
sub list_test_types () {