Skip to content

Commit 76c4076

Browse files
mohawk2bingos
authored andcommitted
turn ugly distro subdir into nice hash2files
1 parent 6f00226 commit 76c4076

File tree

19 files changed

+25
-27
lines changed

19 files changed

+25
-27
lines changed

MANIFEST

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -100,23 +100,6 @@ t/lib/Test/Simple.pm
100100
t/lib/TieIn.pm
101101
t/lib/TieOut.pm
102102
t/Liblist.t
103-
t/liblist/win32/__test.lib
104-
't/liblist/win32/di r/dir_test.lib'
105-
t/liblist/win32/dir/dir_test.lib
106-
t/liblist/win32/double.lib
107-
t/liblist/win32/imp.dll.a
108-
t/liblist/win32/lib/CORE/c_test.lib
109-
t/liblist/win32/lib/CORE/double.lib
110-
t/liblist/win32/lib__test.lib
111-
t/liblist/win32/lib_test.lib
112-
t/liblist/win32/libpath/lp_test.lib
113-
t/liblist/win32/pl.lib
114-
't/liblist/win32/space lib.lib'
115-
t/liblist/win32/test.a.lib
116-
t/liblist/win32/test.lib
117-
t/liblist/win32/test.meep
118-
t/liblist/win32/test2.lib
119-
t/liblist/win32/vc/vctest.lib
120103
t/Liblist_Kid.t
121104
t/make.t
122105
t/MakeMaker_Parameters.t

t/Liblist_Kid.t

Lines changed: 25 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ use Cwd;
77
use File::Temp qw[tempdir];
88

99
use lib 't/lib';
10+
use MakeMaker::Test::Utils;
1011

1112
# Liblist wants to be an object which has File::Spec capabilities, so we
1213
# mock one.
@@ -71,19 +72,33 @@ sub conf_reset {
7172
my $cwd;
7273
sub move_to_os_test_data_dir {
7374
my %os_test_dirs = (
74-
win32 => 't/liblist/win32',
75-
unix_os2 => \'',
75+
win32 => {
76+
'__test.lib' => '',
77+
'di r/dir_test.lib' => '',
78+
'dir/dir_test.lib' => '',
79+
'double.lib' => '',
80+
'imp.dll.a' => '',
81+
'lib/CORE/c_test.lib' => '',
82+
'lib/CORE/double.lib' => '',
83+
'lib__test.lib' => '',
84+
'lib_test.lib' => '',
85+
'libpath/lp_test.lib' => '',
86+
'pl.lib' => '',
87+
'space lib.lib' => '',
88+
'test.a.lib' => '',
89+
'test.lib' => '',
90+
'test.meep' => '',
91+
'test2.lib' => '',
92+
'vc/vctest.lib' => '',
93+
},
94+
unix_os2 => {
95+
"libfoo.$Config{so}" => '',
96+
},
7697
);
7798
$cwd = getcwd; END { chdir $cwd } # so File::Temp can cleanup
7899
return if !$os_test_dirs{$OS};
79-
my $new_dir;
80-
if (ref $os_test_dirs{$OS}) {
81-
$new_dir = tempdir( DIR => 't', CLEANUP => 1 );
82-
my $lib = File::Spec->catfile($new_dir, "libfoo.$Config{so}");
83-
open my $fh, '>', $lib;
84-
} else {
85-
$new_dir = $os_test_dirs{$OS};
86-
}
100+
my $new_dir = tempdir( DIR => 't', CLEANUP => 1 );
101+
hash2files($new_dir, $os_test_dirs{$OS});
87102
chdir $new_dir or die "Could not change to liblist test dir '$new_dir': $!";
88103
}
89104

t/liblist/win32/__test.lib

Whitespace-only changes.

t/liblist/win32/di r/dir_test.lib

Whitespace-only changes.

t/liblist/win32/dir/dir_test.lib

Whitespace-only changes.

t/liblist/win32/double.lib

Whitespace-only changes.

t/liblist/win32/imp.dll.a

Whitespace-only changes.

t/liblist/win32/lib/CORE/c_test.lib

Whitespace-only changes.

t/liblist/win32/lib/CORE/double.lib

Whitespace-only changes.

t/liblist/win32/lib__test.lib

Whitespace-only changes.

0 commit comments

Comments
 (0)