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/executables | |
| 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/executables')
| -rwxr-xr-x | test/executables/puppetbin.rb | 4 | ||||
| -rwxr-xr-x | test/executables/puppetca.rb | 4 | ||||
| -rwxr-xr-x | test/executables/puppetd.rb | 4 | ||||
| -rwxr-xr-x | test/executables/puppetmasterd.rb | 4 | ||||
| -rwxr-xr-x | test/executables/puppetmodule.rb | 4 |
5 files changed, 15 insertions, 5 deletions
diff --git a/test/executables/puppetbin.rb b/test/executables/puppetbin.rb index c3d357398..4fde6ba59 100755 --- a/test/executables/puppetbin.rb +++ b/test/executables/puppetbin.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/server' diff --git a/test/executables/puppetca.rb b/test/executables/puppetca.rb index 137bdf922..f96e7a5f5 100755 --- a/test/executables/puppetca.rb +++ b/test/executables/puppetca.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/server' diff --git a/test/executables/puppetd.rb b/test/executables/puppetd.rb index 9098d76c2..ffe0b001e 100755 --- a/test/executables/puppetd.rb +++ b/test/executables/puppetd.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/server' diff --git a/test/executables/puppetmasterd.rb b/test/executables/puppetmasterd.rb index 0b8c549ec..6fc98137b 100755 --- a/test/executables/puppetmasterd.rb +++ b/test/executables/puppetmasterd.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/server' diff --git a/test/executables/puppetmodule.rb b/test/executables/puppetmodule.rb index b809f218a..c70f92fe9 100755 --- a/test/executables/puppetmodule.rb +++ b/test/executables/puppetmodule.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/server' |