[svn:Module-Build] r13289 - Module-Build/trunk/t

[email protected] Mon, 7 Sep 2009 19:31:17 -0700 (PDT)
Newsgroups perl.module.build.checkins
Message-ID <[email protected]>
Author: dagolden
Date: Mon Sep  7 19:31:16 2009
New Revision: 13289

Modified:
   Module-Build/trunk/t/install_extra_target.t

Log:
Fixed test to avoid conflict with automatic share_dir


Modified: Module-Build/trunk/t/install_extra_target.t
==============================================================================
--- Module-Build/trunk/t/install_extra_target.t	(original)
+++ Module-Build/trunk/t/install_extra_target.t	Mon Sep  7 19:31:16 2009
@@ -45,11 +45,11 @@
 }
 
 #Copy share files to blib
-sub process_share_files
+sub process_shared_files
 {
 	my $self = shift;
 
-	$self->copy_files("share");
+	$self->copy_files("shared");
 }
 
 1;
@@ -61,23 +61,23 @@
 );
 
 $build->add_build_element('etc');
-$build->add_build_element('share');
+$build->add_build_element('shared');
 
 my $distdir = lc $build->dist_name();
 
 foreach my $id ('core', 'site', 'vendor') {
 	#Where to install these build types when using prefix symantics
-	$build->prefix_relpaths($id, 'share' => "share/$distdir");
+	$build->prefix_relpaths($id, 'shared' => "shared/$distdir");
 	$build->prefix_relpaths($id, 'etc' => "etc/$distdir");
 
 	#Where to install these build types when using default symantics
 	my $set = $build->install_sets($id);
-	$set->{'share'} = '/usr/'.($id eq 'site' ? 'local/':'')."share/$distdir";
+	$set->{'shared'} = '/usr/'.($id eq 'site' ? 'local/':'')."shared/$distdir";
 	$set->{'etc'} = ($id eq 'site' ? '/usr/local/etc/':'/etc/').$distdir;
 }
 
 #Where to install these types when using install_base symantics
-$build->install_base_relpaths('share' => "share/$distdir");
+$build->install_base_relpaths('shared' => "shared/$distdir");
 $build->install_base_relpaths('etc' => "etc/$distdir");
 
 $build->create_build_script();
@@ -96,12 +96,12 @@
 
 ===EOF===
 
-$dist->add_file("share/data", <<'===EOF===');
+$dist->add_file("shared/data", <<'===EOF===');
 7 * 9 = 42?
 
 ===EOF===
 
-$dist->add_file("share/html/index.html", <<'===EOF===');
+$dist->add_file("shared/html/index.html", <<'===EOF===');
 <HTML>
   <BODY>
     <H1>Hello World!</H1>
@@ -121,15 +121,15 @@
 
 my $error;
 $error++ unless ok(-e "blib/etc/config", "Built etc/config");
-$error++ unless ok(-e "blib/share/data", "Built share/data");
-$error++ unless ok(-e "blib/share/html/index.html", "Built share/html");
+$error++ unless ok(-e "blib/shared/data", "Built shared/data");
+$error++ unless ok(-e "blib/shared/html/index.html", "Built shared/html");
 diag "OUTPUT:\n$output" if $error;
 
 $output = stdout_of sub { $dist->run_build('install') };
 
 $error = 0;
 $error++ unless ok(-e "$installdest/etc/simple/config", "installed etc/config");
-$error++ unless ok(-e "$installdest/share/simple/data", "installed share/data");
-$error++ unless ok(-e "$installdest/share/simple/html/index.html", "installed share/html");
+$error++ unless ok(-e "$installdest/shared/simple/data", "installed shared/data");
+$error++ unless ok(-e "$installdest/shared/simple/html/index.html", "installed shared/html");
 diag "OUTPUT:\n$output" if $error;