summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2023-10-10 12:32:40 +0200
committerRichard Levitte <levitte@openssl.org>2023-10-11 14:16:43 +0200
commit715242b1ca2b7267a70fb13c3544a84b947a6e81 (patch)
treec776bb79c103ab9e8cf545f8acb1e68747121803
parent6cf23ce54d4b9e3b11c8b4807c62ecba27e3aa16 (diff)
test/recipes/05-test_rand.t: replace 'and' with '&&'
The lower priority 'and' seems to have some "interesting" interactions with function argument parsing in some perl versions (presumably because 'and' is lower priority than the comma). For the lines that are changed here, perl v5.20.1 says this: Useless use of string eq in void context at [.test.recipes]05-test_rand.t line 33. Useless use of numeric eq (==) in void context at [.test.recipes]05-test_rand.t line 39. Replacing 'and' with '&&' in these two cases fixes the problem. Replacing Reviewed-by: Hugo Landau <hlandau@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Paul Dale <pauli@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/22331)
-rw-r--r--test/recipes/05-test_rand.t4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/recipes/05-test_rand.t b/test/recipes/05-test_rand.t
index 60fcb04ca6..6d097c1721 100644
--- a/test/recipes/05-test_rand.t
+++ b/test/recipes/05-test_rand.t
@@ -29,12 +29,12 @@ SKIP: {
@randdata = run(app(['openssl', 'rand', '-engine', 'ossltest', '-hex', '16' ]),
capture => 1, statusvar => \$success);
chomp(@randdata);
- ok($success and $randdata[0] eq $expected,
+ ok($success && $randdata[0] eq $expected,
"rand with ossltest: Check rand output is as expected");
@randdata = run(app(['openssl', 'rand', '-engine', 'dasync', '-hex', '16' ]),
capture => 1, statusvar => \$success);
chomp(@randdata);
- ok($success and length($randdata[0]) == 32,
+ ok($success && length($randdata[0]) == 32,
"rand with dasync: Check rand output is of expected length");
}