Adapt to diffrent OpenSSL utility locations.

diff --git a/test/runex.pl b/test/runex.pl
index 25ae879d766a1f65efef97af40d36bdfa047d7b5..5e460a30ad417fe44d5180401bf4de7f75a82cf2 100644 (file)
--- a/test/runex.pl
+++ b/test/runex.pl
@@ -58,10 +58,23 @@ use MIME::Base64;
 my $badttest = 0;
 my $verbose  = 1;
 
-my $cmscmd = "../util/shlib_wrap.sh ../apps/openssl cms";
+my $cmscmd;
 my $exdir  = "./";
 my $exfile = "./rfc4134.txt";
 
+if (-f "../apps/openssl")
+       {
+       $cmscmd = "../util/shlib_wrap.sh ../apps/openssl cms";
+       }
+elsif (-f "..\\out32dll\\openssl.exe")
+       {
+       $cmscmd = "..\\out32dll\\openssl.exe cms";
+       }
+elsif (-f "..\\out32\\openssl.exe")
+       {
+       $cmscmd = "..\\out32\\openssl.exe cms";
+       }
+
 my @test_list = (
     [ "3.1.bin"  => "dataout" ],
     [ "3.2.bin"  => "encode, dataout" ],