[Module-build-checkins] Module-Build/t destinations.t,1.1,1.2
Status: Beta
Brought to you by:
kwilliams
|
From: Ken W. <kwi...@us...> - 2005-06-08 03:48:15
|
Update of /cvsroot/module-build/Module-Build/t In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24349/t Modified Files: destinations.t Log Message: Fix some testing errors when prefix is '/' Index: destinations.t =================================================================== RCS file: /cvsroot/module-build/Module-Build/t/destinations.t,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- destinations.t 7 Jun 2005 03:34:22 -0000 1.1 +++ destinations.t 8 Jun 2005 03:48:06 -0000 1.2 @@ -63,25 +63,31 @@ $m->prefix( $prefix ); ok( $m->{properties}{prefix} eq $prefix ); -my $test_val; +my $c = \%Config; -($test_val = $Config{installsitelib}) =~ s!\Q$site_prefix\E\b!$prefix!; -ok( $m->install_destination( 'lib' ), $test_val ); +my $naive_prefix = sub { + my ($path) = @_; + (my $bare = $path) =~ s!^\Q$site_prefix\E\b!!; + return catdir($prefix, $bare); +}; -($test_val = $Config{installsitearch}) =~ s!\Q$site_prefix\E\b!$prefix!; -ok( $m->install_destination( 'arch' ), $test_val ); +ok( $m->install_destination( 'lib' ), + $naive_prefix->($c->{installsitelib}) ); -($test_val = $Config{installsitebin}) =~ s!\Q$site_prefix\E\b!$prefix!; -ok( $m->install_destination( 'bin' ), $test_val ); +ok( $m->install_destination( 'arch' ), + $naive_prefix->($c->{installsitearch}) ); -($test_val = $Config{installscript}) =~ s!\Q$site_prefix\E\b!$prefix!; -ok( $m->install_destination( 'script' ), $test_val ); +ok( $m->install_destination( 'bin' ), + $naive_prefix->($c->{installsitebin}) ); -($test_val = $Config{installsiteman1dir}) =~ s!\Q$site_prefix\E\b!$prefix!; -ok( $m->install_destination( 'bindoc' ), $test_val ); +ok( $m->install_destination( 'script' ), + $naive_prefix->($c->{installscript}) ); -($test_val = $Config{installsiteman3dir}) =~ s!\Q$site_prefix\E\b!$prefix!; -ok( $m->install_destination( 'libdoc' ), $test_val ); +ok( $m->install_destination( 'bindoc' ), + $naive_prefix->($c->{installsiteman1dir} || $c->{installman1dir}) ); + +ok( $m->install_destination( 'libdoc' ), + $naive_prefix->($c->{installsiteman3dir} || $c->{installman3dir})); $m->install_base( $install_base ); |