projects
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
68a1e0b
)
The 1.0.2 cms-test.pl had some changes that don't quite work on VMS...
author
Richard Levitte
<richard@levitte.org>
Thu, 12 Jun 2014 14:58:39 +0000
(16:58 +0200)
committer
Richard Levitte
<richard@levitte.org>
Thu, 12 Jun 2014 14:58:39 +0000
(16:58 +0200)
test/cms-test.pl
patch
|
blob
|
history
diff --git
a/test/cms-test.pl
b/test/cms-test.pl
index 006733a6befeee223c0431c8a1f9a16417d0cd39..46827f9124abdc8b816b47e397e942be8335745f 100644
(file)
--- a/
test/cms-test.pl
+++ b/
test/cms-test.pl
@@
-58,19
+58,24
@@
my $redir = " 2> cms.err > cms.out";
# Make VMS work
if ( $^O eq "VMS" && -f "OSSLX:openssl.exe" ) {
$ossl_path = "pipe mcr OSSLX:openssl";
# Make VMS work
if ( $^O eq "VMS" && -f "OSSLX:openssl.exe" ) {
$ossl_path = "pipe mcr OSSLX:openssl";
+ $null_path = "NL:";
}
# Make MSYS work
elsif ( $^O eq "MSWin32" && -f "../apps/openssl.exe" ) {
$ossl_path = "cmd /c ..\\apps\\openssl";
}
# Make MSYS work
elsif ( $^O eq "MSWin32" && -f "../apps/openssl.exe" ) {
$ossl_path = "cmd /c ..\\apps\\openssl";
+ $null_path = "/dev/null";
}
elsif ( -f "../apps/openssl$ENV{EXE_EXT}" ) {
$ossl_path = "../util/shlib_wrap.sh ../apps/openssl";
}
elsif ( -f "../apps/openssl$ENV{EXE_EXT}" ) {
$ossl_path = "../util/shlib_wrap.sh ../apps/openssl";
+ $null_path = "/dev/null";
}
elsif ( -f "..\\out32dll\\openssl.exe" ) {
$ossl_path = "..\\out32dll\\openssl.exe";
}
elsif ( -f "..\\out32dll\\openssl.exe" ) {
$ossl_path = "..\\out32dll\\openssl.exe";
+ $null_path = "/dev/null";
}
elsif ( -f "..\\out32\\openssl.exe" ) {
$ossl_path = "..\\out32\\openssl.exe";
}
elsif ( -f "..\\out32\\openssl.exe" ) {
$ossl_path = "..\\out32\\openssl.exe";
+ $null_path = "/dev/null";
}
else {
die "Can't find OpenSSL executable";
}
else {
die "Can't find OpenSSL executable";
@@
-85,12
+90,12
@@
my $badcmd = 0;
my $no_ec;
my $ossl8 = `$ossl_path version -v` =~ /0\.9\.8/;
my $no_ec;
my $ossl8 = `$ossl_path version -v` =~ /0\.9\.8/;
-system ("$ossl_path no-ec >
/dev/null
");
+system ("$ossl_path no-ec >
$null_path
");
if ($? == 0)
{
$no_ec = 1;
}
if ($? == 0)
{
$no_ec = 1;
}
-elsif ($? == 256)
+elsif ($
^O eq "VMS" ? $? == 512 : $
? == 256)
{
$no_ec = 0;
}
{
$no_ec = 0;
}