diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/cms-test.pl | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/test/cms-test.pl b/test/cms-test.pl index 7d4ca2990a..f55fd69ce8 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"; @@ -87,12 +92,12 @@ my $no_ec2m; my $no_ecdh; 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; } @@ -101,7 +106,7 @@ else die "Error checking for EC support\n"; } -system ("$ossl_path no-ec2m >/dev/null"); +system ("$ossl_path no-ec2m > $null_path"); if ($? == 0) { $no_ec2m = 1; @@ -115,7 +120,7 @@ else die "Error checking for EC2M support\n"; } -system ("$ossl_path no-ecdh >/dev/null"); +system ("$ossl_path no-ecdh > $null_path"); if ($? == 0) { $no_ecdh = 1; |