moparisthebest/wget
1
0
Fork 0
mirror of https://github.com/moparisthebest/wget synced 2024-07-03 16:38:41 -04:00
Code Issues Releases Wiki Activity

Fix make distcheck failures in Perl SSL Tests

Browse Source 
* tests/Makefile.am: Add valgrind-suppressions-ssl to EXTRA_DIST
    * tests/Test-proxied-https-auth-keepalive.px: Find valgrind in
    correct path during make distcheck
    * tests/Test-proxied-https-auth.px: Same
This commit is contained in:
Darshit Shah 2015-09-28 20:53:48 +05:30
parent b8ee370571
commit d484b14174
3 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/Makefile.am
View File

@ -132,7 +132,7 @@ PX_TESTS = \
EXTRA_DIST = FTPServer.pm FTPTest.pm HTTPServer.pm HTTPTest.pm \ EXTRA_DIST = FTPServer.pm FTPTest.pm HTTPServer.pm HTTPTest.pm \
WgetTests.pm WgetFeature.pm WgetFeature.cfg $(PX_TESTS) \ WgetTests.pm WgetFeature.pm WgetFeature.cfg $(PX_TESTS) \
certs valgrind-suppressions certs valgrind-suppressions valgrind-suppressions-ssl
check_PROGRAMS = unit-tests check_PROGRAMS = unit-tests
unit_tests_SOURCES = unit_tests_SOURCES =

13
tests/Test-proxied-https-auth-keepalive.px
View File

@ -12,6 +12,8 @@ my $cert_path;
my $key_path; my $key_path;
my $srcdir; my $srcdir;
our $VALGRIND_SUPP_FILE;
if (@ARGV) { if (@ARGV) {
$srcdir = shift @ARGV; $srcdir = shift @ARGV;
} elsif (defined $ENV{srcdir}) { } elsif (defined $ENV{srcdir}) {
@ -153,11 +155,20 @@ my $cmdline = $WgetTest::WGETPATH . " --user=fiddle-dee-dee"
. " https://no.such.domain/needs-auth.txt"; . " https://no.such.domain/needs-auth.txt";
$cmdline =~ s/{{port}}/$SOCKET->sockport()/e; $cmdline =~ s/{{port}}/$SOCKET->sockport()/e;
if (defined $srcdir) {
$VALGRIND_SUPP_FILE = $srcdir . '/valgrind-suppressions-ssl';
} else {
$VALGRIND_SUPP_FILE = './valgrind-suppressions-ssl';
}
my $valgrind = $ENV{VALGRIND_TESTS}; my $valgrind = $ENV{VALGRIND_TESTS};
if (!defined $valgrind || $valgrind eq "" || $valgrind == 0) { if (!defined $valgrind || $valgrind eq "" || $valgrind == 0) {
# Valgrind not requested - leave $cmdline as it is # Valgrind not requested - leave $cmdline as it is
} elsif ($valgrind == 1) { } elsif ($valgrind == 1) {
$cmdline = "valgrind --suppressions=valgrind-suppressions-ssl --error-exitcode=301 --leak-check=yes --track-origins=yes " . $cmdline; $cmdline =
'valgrind --suppressions=' . $VALGRIND_SUPP_FILE
. ' --error-exitcode=301 --leak-check=yes --track-origins=yes '
. $cmdline;
} else { } else {
$cmdline = $valgrind . " " . $cmdline; $cmdline = $valgrind . " " . $cmdline;
} }

13
tests/Test-proxied-https-auth.px
View File

@ -12,6 +12,8 @@ my $cert_path;
my $key_path; my $key_path;
my $srcdir; my $srcdir;
our $VALGRIND_SUPP_FILE;
if (@ARGV) { if (@ARGV) {
$srcdir = shift @ARGV; $srcdir = shift @ARGV;
} elsif (defined $ENV{srcdir}) { } elsif (defined $ENV{srcdir}) {
@ -152,11 +154,20 @@ my $cmdline = $WgetTest::WGETPATH . " --user=fiddle-dee-dee"
. " https://no.such.domain/needs-auth.txt"; . " https://no.such.domain/needs-auth.txt";
$cmdline =~ s/{{port}}/$SOCKET->sockport()/e; $cmdline =~ s/{{port}}/$SOCKET->sockport()/e;
if (defined $srcdir) {
$VALGRIND_SUPP_FILE = $srcdir . '/valgrind-suppressions-ssl';
} else {
$VALGRIND_SUPP_FILE = './valgrind-suppressions-ssl';
}
my $valgrind = $ENV{VALGRIND_TESTS}; my $valgrind = $ENV{VALGRIND_TESTS};
if (!defined $valgrind || $valgrind eq "" || $valgrind == 0) { if (!defined $valgrind || $valgrind eq "" || $valgrind == 0) {
# Valgrind not requested - leave $cmdline as it is # Valgrind not requested - leave $cmdline as it is
} elsif ($valgrind == 1) { } elsif ($valgrind == 1) {
$cmdline = "valgrind --suppressions=valgrind-suppressions-ssl --error-exitcode=301 --leak-check=yes --track-origins=yes " . $cmdline; $cmdline =
'valgrind --suppressions=' . $VALGRIND_SUPP_FILE
. ' --error-exitcode=301 --leak-check=yes --track-origins=yes '
. $cmdline;
} else { } else {
$cmdline = $valgrind . " " . $cmdline; $cmdline = $valgrind . " " . $cmdline;
} }