Test suite: minimal required to get mingw 'make test' work under Linux.

(part by Alessandro Ghedini)

Reviewed-by: Richard Levitte <levitte@openssl.org>

2 files changed, 11 insertions, 3 deletions

diff --git a/test/testlib/OpenSSL/Test.pm b/test/testlib/OpenSSL/Test.pm
index c64d68d..453e3d7 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
diff --git a/test/testlib/OpenSSL/Test/Utils.pm b/test/testlib/OpenSSL/Test/Utils.pm
index fc9b533..5312c205 100644
--- a/test/testlib/OpenSSL/Test/Utils.pm
+++ b/test/testlib/OpenSSL/Test/Utils.pm
@@ -46,7 +46,7 @@ my $disabled_set = 0;
 sub check_disabled {
 #print STDERR "Running check_disabled\n";
     foreach (run(app(["openssl", "list", "-disabled"]), capture => 1)) {
-        chomp;
+        s/\R//;         # chomp;
         next if /:/;    # skip header
         $disabled{lc $_} = 1;
     }