From 995fe296c44908d420462e21f41365a921d9ae0d Mon Sep 17 00:00:00 2001 From: Andrew Ruthven Date: Sat, 3 Feb 2024 18:05:46 +1300 Subject: [PATCH] All debug output goes to STDERR so not combined with test results --- testing/dav_test | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/testing/dav_test b/testing/dav_test index e59e1452..8d2bfd8b 100755 --- a/testing/dav_test +++ b/testing/dav_test @@ -262,7 +262,8 @@ else { if ( defined($url) ) { push @arguments, $url; - print STDERR join " ", "curl", @arguments, "\n" if ( $debug ); + warn join " ", "curl", @arguments, "\n" + if $debug; open RESULTS, "-|", "curl", @arguments; while( ) { @@ -290,7 +291,9 @@ if ( defined($script) ) { if ( defined($queries) && @{$queries} ) { opendb() unless defined($dbh); print "\n"; - print STDERR "Processing special queries\n" if ( $debug ); + warn "Processing special queries\n" + if $debug; + foreach $sql_statement ( @$queries ) { # run SQL statement and dump results, into array of hashes my $results = $dbh->selectall_arrayref($sql_statement, { Slice => {} } ); @@ -299,7 +302,8 @@ if ( defined($queries) && @{$queries} ) { next; } foreach my $row ( @$results ) { - print "Query result ================================================\n" if ( $debug ); + warn "Query result ================================================\n" + if $debug; my $sep = ""; foreach my $name ( sort keys %$row ) { my $value = $row->{$name}; @@ -349,7 +353,10 @@ sub get_sql_value { print $dbh->errstr, "\n"; return; } - print STDERR "RESULT for $varname is ", $results->[0][0], "\n" if ( $debug ); + + warn "RESULT for $varname is ", $results->[0][0], "\n" + if $debug; + $values->{$varname} = (defined($results->[0][0]) ? $results->[0][0] : ""); }