From: Dr. Stephen Henson <steve@openssl.org>
Date: Sun, 16 Mar 2008 19:10:02 +0000 (+0000)
Subject: Adapt to diffrent OpenSSL utility locations.
X-Git-Tag: OpenSSL_0_9_8k^2~520
X-Git-Url: https://git.openssl.org/?p=openssl.git;a=commitdiff_plain;h=3667a6f5b354484301d1e862e8281cd466a0fe88;ds=sidebyside

Adapt to diffrent OpenSSL utility locations.
---

diff --git a/test/runex.pl b/test/runex.pl
index 25ae879d76..5e460a30ad 100644
--- 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" ],