From ca422f356307012ba7a2325db8461aa3ba43e063 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Thu, 12 Jun 2014 16:58:39 +0200 Subject: [PATCH] The 1.0.2 cms-test.pl had some changes that don't quite work on VMS... --- test/cms-test.pl | 9 +++++++-- 1 file 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; } -- 2.34.1