X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=test%2Ftestlib%2FOpenSSL%2FTest.pm;h=453e3d79deb5a89d8aa9bc3f075ec87587d65675;hp=c64d68de46c35848ff4d635e50ed5c1b4ce60004;hb=4ada8be2a6c538ee66a9a35a182052f359fc94b3;hpb=1dce6c3f9eef0da2866b82d816dc945883427060

diff --git a/test/testlib/OpenSSL/Test.pm b/test/testlib/OpenSSL/Test.pm
index c64d68de46..453e3d79de 100644
--- a/test/testlib/OpenSSL/Test.pm
+++ b/test/testlib/OpenSSL/Test.pm
@@ -357,7 +357,7 @@ operating system.
 =cut
 
 sub top_dir {
-    return __top_file(@_, "");	# This caters for operating systems that have
+    return __top_dir(@_);	# This caters for operating systems that have
 				# a very distinct syntax for directories.
 }
 
@@ -577,6 +577,12 @@ sub __top_file {
     return catfile($directories{TOP},@_,$f);
 }
 
+sub __top_dir {
+    BAIL_OUT("Must run setup() first") if (! $test_name);
+
+    return catdir($directories{TOP},@_);
+}
+
 sub __test_file {
     BAIL_OUT("Must run setup() first") if (! $test_name);
 
@@ -668,7 +674,9 @@ sub __fixup_cmd {
     my $prefix = __top_file("util", "shlib_wrap.sh")." ";
     my $ext = $ENV{"EXE_EXT"} || "";
 
-    if ( $^O eq "VMS" ) {	# VMS
+    if (defined($ENV{EXE_SHELL})) {
+	$prefix = "$ENV{EXE_SHELL} ";
+    } elsif ($^O eq "VMS" ) {	# VMS
 	$prefix = "mcr ";
 	$ext = ".exe";
     } elsif ($^O eq "MSWin32") { # Windows