Skip to content
Permalink
Browse files

Checking with runclientoutput rather than redirect

  • Loading branch information...
Stephan Szabo
Stephan Szabo committed Jul 1, 2019
1 parent d03dcdc commit 3eac546a6b52663ecc8487e07de4037dca0116f3
Showing with 9 additions and 16 deletions.
  1. +9 −16 tests/runtests.pl
@@ -2653,10 +2653,8 @@ sub checksystem {
@version = <VERSOUT>;
close(VERSOUT);

open(DISABLED, "server/disabled|");
@disabled = <DISABLED>;
close(DISABLED);

my $disabled = runclientoutput("server/disabled");
@disabled = split /\n/, $disabled;
if($disabled[0]) {
map s/[\r\n]//g, @disabled;
$dis = join(", ", @disabled);
@@ -2932,20 +2930,15 @@ sub checksystem {
"TrackMemory feature (--enable-curldebug)";
}

my $curlmanualout="$LOGDIR/curlmanualout.log";
my $manualcmd="$CURL -M 1>$curlmanualout 2>&1";
unlink($curlmanualout);
runclient($manualcmd);
open(M, "<$curlmanualout");
while(my $s = <M>) {
if($s =~ /built-in manual was disabled at build-time/) {
$has_manual = 0;
last;
}
my $manualcmd="$CURL -M 2>&1";
my $manualout = runclientoutput($manualcmd);
my @manualout = split /\n/, $manualout;
if($manualout[0] =~ /built-in manual was disabled at build-time/) {
$has_manual = 0;
}
else {
$has_manual = 1;
last;
}
close(M);

$has_shared = `sh $CURLCONFIG --built-shared`;
chomp $has_shared;

0 comments on commit 3eac546

Please sign in to comment.
You can’t perform that action at this time.