Skip to content

Commit d63617c

Browse files
committed
make it compatible when run locally
1 parent 815e737 commit d63617c

1 file changed

Lines changed: 19 additions & 6 deletions

File tree

t/12_diff_opensslversions.t

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,21 +31,34 @@ unlink $csvfile;
3131
unlink $csvfile2;
3232

3333
#1 run
34-
3534
if ( $os eq "linux" ){
35+
# Comparison ~/bin/openssl.Linux.x86_64
3636
printf "\n%s\n", "Test with supplied openssl against \"$uri\" and save it";
3737
@args="$prg $check2run $csvfile $uri >/dev/null";
3838
} elsif ( $os eq "darwin" ){
39-
# macos silicon doesn't have ~/bin/openssl.Darwin.arm64 binary so we use the
39+
# MacOS silicon doesn't have ~/bin/openssl.Darwin.arm64 binary so we use the
4040
# homebrew version which was moved to /opt/homebrew/bin/openssl.NOPE in
41-
# .github/workflows/unit_tests_macos.yml
42-
printf "\n%s\n", "Test with homebrew's openssl 3.5.x against \"$uri\" and save it";
43-
@args="$prg $check2run $csvfile --openssl /opt/homebrew/bin/openssl.NOPE $uri >/dev/null";
41+
# .github/workflows/unit_tests_macos.yml . This gives us instead a comparison
42+
# check from OpenSSL
43+
# If this will be run outside GH actions, i.e. locally, we provide a fallback to
44+
# /opt/homebrew/bin/openssl or just leave this thing
45+
if ( -x "/opt/homebrew/bin/openssl.NOPE" ) {
46+
printf "\n%s\n", "Test with homebrew's openssl 3.5.x against \"$uri\" and save it";
47+
@args="$prg $check2run $csvfile --openssl /opt/homebrew/bin/openssl.NOPE $uri >/dev/null";
48+
}
49+
elsif ( -x "/opt/homebrew/bin/openssl" ) {
50+
printf "\n%s\n", "Test with homebrew's openssl 3.5.x against \"$uri\" and save it";
51+
@args="$prg $check2run $csvfile --openssl /opt/homebrew/bin/openssl $uri >/dev/null";
52+
}
53+
else {
54+
die ("No alternative version to LibreSSL found");
55+
}
4456
}
4557
system("@args") == 0
4658
or die ("FAILED: \"@args\"");
4759

48-
# 2 (LibreSSL in case of MacOS)
60+
61+
# 2 (LibreSSL in case of MacOS, /usr/bin/openssl for Linux)
4962
printf "\n%s\n", "Test with $distro_openssl against \"$uri\" and save it";
5063
@args="$prg $check2run $csvfile2 --openssl=$distro_openssl $uri >/dev/null";
5164
system("@args") == 0

0 commit comments

Comments
 (0)