Commit cb2ceb18 authored by Richard Levitte's avatar Richard Levitte
Browse files

Enhance OpenSSL::Test::cmdstr to give cmd string variants 



Within OpenSSL::Test, all commands end up existing in two variants,
one that has redirections that are needed internally to work well
together with the test harness, and one without those redirections.

Depending on what the result is going to be used for, the caller may
want one for or the other, so we give them the possibility.

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent d3e6d6bc

test/testlib/OpenSSL/Test.pm

+25 −2
Original line number Diff line number Diff line
@@ -548,20 +548,43 @@ sub with { 


=over 4



=item B<cmdstr CODEREF>

=item B<cmdstr CODEREF, OPTS>



C<cmdstr> takes a CODEREF from C<app> or C<test> and simply returns the

command as a string.



C<cmdstr> takes some additiona options OPTS that affect the string returned:



=over 4



=item B<display =E<gt> 0|1>



When set to 0, the returned string will be with all decorations, such as a

possible redirect of stderr to the null device.  This is suitable if the

string is to be used directly in a recipe.



When set to 1, the returned string will be without extra decorations.  This

is suitable for display if that is desired (doesn't confuse people with all

internal stuff), or if it's used to pass a command down to a subprocess.



Default: 0



=back



=back



=cut



sub cmdstr {

    my ($cmd, $display_cmd) = shift->(0);

    my %opts = @_;



    if ($opts{display}) {

        return $display_cmd;

    } else {

        return $cmd;

    }

}



=over 4