diff options
author | Richard Levitte <levitte@openssl.org> | 2016-01-14 13:15:45 +0100 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2016-01-14 13:15:45 +0100 |
commit | 9b56815d5f91180e2092d3e578054b8099100a48 (patch) | |
tree | 21ee40561726f01fc65adba7443e8e535ca85c0e | |
parent | 67949615d25ead969c12e0f39370fef866df1704 (diff) |
Do not use redirection on binary files
On some platforms, the shell will determine what attributes a file
will have, so while the program might think it's safely outputting
binary data, it's not always true.
For the sake of the tests, it's therefore safer to use -out than to
use redirection.
Reviewed-by: Rich Salz <rsalz@openssl.org>
-rw-r--r-- | test/recipes/20-test_enc.t | 6 | ||||
-rw-r--r-- | test/recipes/tconversion.pl | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/test/recipes/20-test_enc.t b/test/recipes/20-test_enc.t index 836d9792f9..55f39421fe 100644 --- a/test/recipes/20-test_enc.t +++ b/test/recipes/20-test_enc.t @@ -51,10 +51,8 @@ if (!$init) { @d = ( "enc", @{$variant{$t}}, "-d" ); } - ok(run(app([$cmd, @e], - stdin => $test, stdout => $cipherfile)) - && run(app([$cmd, @d], - stdin => $cipherfile, stdout => $clearfile)) + ok(run(app([$cmd, @e, "-in", $test, "-out", $cipherfile])) + && run(app([$cmd, @d, "-in", $cipherfile, "-out", $clearfile])) && compare_text($test,$clearfile) == 0, $t); unlink $cipherfile, $clearfile; } diff --git a/test/recipes/tconversion.pl b/test/recipes/tconversion.pl index 07e34060f3..0f9b03b481 100644 --- a/test/recipes/tconversion.pl +++ b/test/recipes/tconversion.pl @@ -53,8 +53,9 @@ sub tconversion { ok(run(app([@cmd, "-in", "$testtype-fff.p", "-inform", "p", - "-outform", $to], - stdout => "$testtype-f.$to")), "p -> $to"); + "-out", "$testtype-f.$to", + "-outform", $to])), + "p -> $to"); } foreach my $to (@conversionforms) { @@ -62,8 +63,9 @@ sub tconversion { ok(run(app([@cmd, "-in", "$testtype-f.$from", "-inform", $from, - "-outform", $to], - stdout => "$testtype-ff.$from$to")), "$from -> $to"); + "-out", "$testtype-ff.$from$to", + "-outform", $to])), + "$from -> $to"); } } |