[DRE-commits] [gem2deb] 06/08: Support running gem2deb testsuite under autopkgtest

[Antonio Terceiro]

This is an automated email from the git hooks/post-receive script.

terceiro pushed a commit to branch master
in repository gem2deb.

commit d2235fbaa55c5112d4acad3a5d60fedade81832f
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Mon Feb 10 11:39:04 2014 -0300

    Support running gem2deb testsuite under autopkgtest
---
 test/test_helper.rb | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/test/test_helper.rb b/test/test_helper.rb
index 42ac62f..b853a7a 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -137,13 +137,17 @@ class Gem2DebTestCase
   # make sure that everything that comes from gem2deb has precedence over
   # system-wide installed versions.
   def self.run_command(cmd)
-    # setup Perl lib for debhelper7
-    perl5lib = File.join(GEM2DEB_ROOT_SOURCE_DIR, 'debhelper7')
+    if !@environment_setup && !ENV['ADTTMP']
+      # setup Perl lib for debhelper7
+      perl5lib = File.join(GEM2DEB_ROOT_SOURCE_DIR, 'debhelper7')
 
-    # setup the environment
-    ENV['PERL5LIB'] = perl5lib
-    ENV['PATH'] = [File.join(GEM2DEB_ROOT_SOURCE_DIR, 'bin'), ENV['PATH']].join(':')
-    ENV['RUBYLIB'] = File.join(GEM2DEB_ROOT_SOURCE_DIR, 'lib')
+      # setup the environment
+      ENV['PERL5LIB'] = perl5lib
+      ENV['PATH'] = [File.join(GEM2DEB_ROOT_SOURCE_DIR, 'bin'), ENV['PATH']].join(':')
+      ENV['RUBYLIB'] = File.join(GEM2DEB_ROOT_SOURCE_DIR, 'lib')
+
+      @environment_setup = true
+    end
 
     @run_command_id ||= -1
     @run_command_id += 1

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/gem2deb.git