diff options
| author | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-10-16 22:01:40 +0000 |
|---|---|---|
| committer | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-10-16 22:01:40 +0000 |
| commit | 9e5ea8c2c52f3d4b48fa01eb56264b323a2c4581 (patch) | |
| tree | 86527a7e02b0cff8893d7f8699af3e82db37d33a /test/puppet | |
| parent | 72688e3444c96655cf108099a0db92ed6b6bd91f (diff) | |
| download | puppet-9e5ea8c2c52f3d4b48fa01eb56264b323a2c4581.tar.gz puppet-9e5ea8c2c52f3d4b48fa01eb56264b323a2c4581.tar.xz puppet-9e5ea8c2c52f3d4b48fa01eb56264b323a2c4581.zip | |
Fixing the test scripts so that the library path
is modified in ruby instead of in the env line
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1793 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'test/puppet')
| -rwxr-xr-x | test/puppet/conffiles.rb | 4 | ||||
| -rwxr-xr-x | test/puppet/defaults.rb | 4 | ||||
| -rwxr-xr-x | test/puppet/errortest.rb | 4 | ||||
| -rwxr-xr-x | test/puppet/tc_suidmanager.rb | 4 |
4 files changed, 12 insertions, 4 deletions
diff --git a/test/puppet/conffiles.rb b/test/puppet/conffiles.rb index ba9a74bd3..201ecc5e6 100755 --- a/test/puppet/conffiles.rb +++ b/test/puppet/conffiles.rb @@ -1,4 +1,6 @@ -#!/usr/bin/env ruby -I../lib -I../../lib +#!/usr/bin/env ruby + +$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/ require 'puppet' require 'puppet/config' diff --git a/test/puppet/defaults.rb b/test/puppet/defaults.rb index 0ba217216..7ac74eb54 100755 --- a/test/puppet/defaults.rb +++ b/test/puppet/defaults.rb @@ -1,4 +1,6 @@ -#!/usr/bin/env ruby -I../lib -I../../lib +#!/usr/bin/env ruby + +$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/ require 'puppet' require 'puppettest' diff --git a/test/puppet/errortest.rb b/test/puppet/errortest.rb index 5e35a8358..27a09ae5a 100755 --- a/test/puppet/errortest.rb +++ b/test/puppet/errortest.rb @@ -1,4 +1,6 @@ -#!/usr/bin/env ruby -I../lib -I../../lib +#!/usr/bin/env ruby + +$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/ require 'puppet' require 'puppettest' diff --git a/test/puppet/tc_suidmanager.rb b/test/puppet/tc_suidmanager.rb index b157080ca..c8a77222a 100755 --- a/test/puppet/tc_suidmanager.rb +++ b/test/puppet/tc_suidmanager.rb @@ -1,4 +1,6 @@ -#!/usr/bin/env ruby -I../lib -I../../lib +#!/usr/bin/env ruby + +$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/ require 'puppet' require 'puppettest' |