Fix running tests with Perl on Windows

Windows-on-ARM-Experiments · Dec 7, 2023 · b58fe4a · b58fe4a
1 parent 8af227c
commit b58fe4a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/configdata.pm.in b/configdata.pm.in
@@ -81,8 +81,8 @@ unless (caller) {
     use File::Copy;
     use Pod::Usage;
 
-    use lib '{- sourcedir('util', 'perl') -}';
-    use OpenSSL::fallback '{- sourcefile('external', 'perl', 'MODULES.txt') -}';
+    use lib;
+    use OpenSSL::fallback;
 
     my $here = dirname($0);
 

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/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();
 }