[Bps-public-commit] r15766 - Test-Chimps-Client/branches/modern-tap/lib/Test/Chimps

[alexmv at bestpractical.com]

Author: alexmv
Date: Thu Sep  4 14:38:38 2008
New Revision: 15766

Modified:
   Test-Chimps-Client/branches/modern-tap/lib/Test/Chimps/Smoker.pm

Log:
 * De-dup entries in libs
 * We (temporarily) need to augment PERL5LIB while we run configure_cmd

Modified: Test-Chimps-Client/branches/modern-tap/lib/Test/Chimps/Smoker.pm
==============================================================================
--- Test-Chimps-Client/branches/modern-tap/lib/Test/Chimps/Smoker.pm	(original)
+++ Test-Chimps-Client/branches/modern-tap/lib/Test/Chimps/Smoker.pm	Thu Sep  4 14:38:38 2008
@@ -330,17 +330,20 @@
     }
   }
 
+  my @libs = qw{blib/lib};
+  push @libs, @{$project->{libs}} if $project->{libs};
+  @libs = map {File::Spec->catdir($tmpdir, $project->{root_dir}, $_)} @libs;
+
+  my %seen;
+  @libs = grep {not $seen{$_}++} @libs, @otherlibs;
+
   chdir($projectdir);
 
+  local $ENV{PERL5LIB} = join(":", at libs,$ENV{PERL5LIB});
   system($project->{configure_cmd})
       if defined $project->{configure_cmd};
 
-  my @libs = qw{blib/lib};
-  push @libs, @{$project->{libs}} if $project->{libs};
-
-  @libs = map {File::Spec->catdir($tmpdir, $project->{root_dir}, $_)} @libs;
-
-  return @libs, @otherlibs;
+  return @libs;
 }
 
 sub _list_dbs {