Fix running tests with Perl on Windows

Windows-on-ARM-Experiments · Dec 7, 2023 · cfda9ad · cfda9ad
1 parent 79997a9
commit cfda9ad
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/test/run_tests.pl b/test/run_tests.pl
@@ -272,9 +272,11 @@ sub find_matching_tests {
             return bless { %args }, $class;
         }
 
-        sub runtests {
+        sub runtests {          
             my $self = shift;
 
+            print $self
+
             # Pre TAP::Harness Test::Harness doesn't support [ filename, name ]
             # elements, so convert such elements to just be the filename
             my @args = map { ref($_) eq 'ARRAY' ? $_->[0] : $_ } @_;

diff --git a/util/perl/OpenSSL/Template.pm b/util/perl/OpenSSL/Template.pm
@@ -38,7 +38,7 @@ L</Functions>.
 
 use File::Basename;
 use File::Spec::Functions;
-use Text::Template 1.46;
+#use Text::Template 1.46;
 
 our @ISA = qw(Text::Template);  # parent
 

diff --git a/util/wrap.pl.in b/util/wrap.pl.in
@@ -9,12 +9,7 @@ use File::Spec::Functions;
 BEGIN {
     # This method corresponds exactly to 'use OpenSSL::Util',
     # but allows us to use a platform specific file spec.
-    require {-
-         use Cwd qw(abs_path);
-
-         "'" . abs_path(catfile($config{sourcedir},
-                                'util', 'perl', 'OpenSSL', 'Util.pm')) . "'";
-         -};
+    require "$ENV{SRCTOP}/util/perl/OpenSSL/Util.pm";
     OpenSSL::Util->import();
 }