diff options
author | Richard Levitte <richard@levitte.org> | 2014-06-12 16:58:39 +0200 |
---|---|---|
committer | Richard Levitte <richard@levitte.org> | 2014-06-12 16:58:39 +0200 |
commit | ca422f356307012ba7a2325db8461aa3ba43e063 (patch) | |
tree | 2a604010c1e7a2f371cc2f5fbebbdf058cf7053e /test/cms-test.pl | |
parent | 68a1e0bc3534be060c520c7ce1c9205538572edf (diff) |
The 1.0.2 cms-test.pl had some changes that don't quite work on VMS...
Diffstat (limited to 'test/cms-test.pl')
-rw-r--r-- | test/cms-test.pl | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/test/cms-test.pl b/test/cms-test.pl index 006733a6be..46827f9124 100644 --- 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"; + $null_path = "NL:"; } # 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"; + $null_path = "/dev/null"; } elsif ( -f "..\\out32dll\\openssl.exe" ) { $ossl_path = "..\\out32dll\\openssl.exe"; + $null_path = "/dev/null"; } elsif ( -f "..\\out32\\openssl.exe" ) { $ossl_path = "..\\out32\\openssl.exe"; + $null_path = "/dev/null"; } 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/; -system ("$ossl_path no-ec >/dev/null"); +system ("$ossl_path no-ec > $null_path"); if ($? == 0) { $no_ec = 1; } -elsif ($? == 256) +elsif ($^O eq "VMS" ? $? == 512 : $? == 256) { $no_ec = 0; } |