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

4 files changed, 12 insertions, 4 deletions

diff --git a/test/util/classgen.rb b/test/util/classgen.rb
index e1c9644a4..2e8374437 100755
--- a/test/util/classgen.rb
+++ b/test/util/classgen.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/util/execution.rb b/test/util/execution.rb
index 45c3a3b07..0b3541775 100755
--- a/test/util/execution.rb
+++ b/test/util/execution.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/util/package.rb b/test/util/package.rb
index 5ea5570f7..73b069f84 100755
--- a/test/util/package.rb
+++ b/test/util/package.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/util/package'
diff --git a/test/util/utiltest.rb b/test/util/utiltest.rb
index 96af3c017..1ab2ebb9c 100755
--- a/test/util/utiltest.rb
+++ b/test/util/utiltest.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'