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

90 files changed, 271 insertions, 92 deletions

diff --git a/test/certmgr/certmgr.rb b/test/certmgr/certmgr.rb
index 9036fadee..5e2210913 100755
--- a/test/certmgr/certmgr.rb
+++ b/test/certmgr/certmgr.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/sslcertificates.rb'
diff --git a/test/client/client.rb b/test/client/client.rb
index 52282d026..d5221fbba 100755
--- a/test/client/client.rb
+++ b/test/client/client.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/client'
diff --git a/test/client/master.rb b/test/client/master.rb
index 0258e6997..67531c62d 100755
--- a/test/client/master.rb
+++ b/test/client/master.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/client'
diff --git a/test/client/pelement.rb b/test/client/pelement.rb
index da0018218..8c8e76963 100755
--- a/test/client/pelement.rb
+++ b/test/client/pelement.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/client/pelement'
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'
diff --git a/test/language/ast.rb b/test/language/ast.rb
index e1924f6f7..2f657e5c8 100755
--- a/test/language/ast.rb
+++ b/test/language/ast.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/rails'
diff --git a/test/language/collector.rb b/test/language/collector.rb
index 6df0d04e3..830ee5463 100755
--- a/test/language/collector.rb
+++ b/test/language/collector.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/rails'
 require 'puppettest'
diff --git a/test/language/functions.rb b/test/language/functions.rb
index 692675da7..76b32138d 100755
--- a/test/language/functions.rb
+++ b/test/language/functions.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/parser/interpreter'
diff --git a/test/language/interpreter.rb b/test/language/interpreter.rb
index 6c16c2788..28c6d41a1 100755
--- a/test/language/interpreter.rb
+++ b/test/language/interpreter.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 'facter'
 
diff --git a/test/language/lexer.rb b/test/language/lexer.rb
index 84d4c447b..498c9fc36 100755
--- a/test/language/lexer.rb
+++ b/test/language/lexer.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/parser/lexer'
diff --git a/test/language/node.rb b/test/language/node.rb
index 4c630dd00..3f5ff5561 100755
--- a/test/language/node.rb
+++ b/test/language/node.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/parser/parser'
diff --git a/test/language/parser.rb b/test/language/parser.rb
index 4a976fc57..a90ff2c7a 100755
--- a/test/language/parser.rb
+++ b/test/language/parser.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/parser/parser'
diff --git a/test/language/resource.rb b/test/language/resource.rb
index e0f9fd947..a9a0a7ef6 100755
--- a/test/language/resource.rb
+++ b/test/language/resource.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 'puppettest'
 require 'puppettest/resourcetesting'
diff --git a/test/language/scope.rb b/test/language/scope.rb
index ab789548e..9178f95d0 100755
--- a/test/language/scope.rb
+++ b/test/language/scope.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/parser/interpreter'
diff --git a/test/language/snippets.rb b/test/language/snippets.rb
index ac0b4f716..283eabdab 100755
--- a/test/language/snippets.rb
+++ b/test/language/snippets.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/parser/interpreter'
diff --git a/test/language/transportable.rb b/test/language/transportable.rb
index 1b3508c1a..3ef82983c 100755
--- a/test/language/transportable.rb
+++ b/test/language/transportable.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/transportable'
diff --git a/test/lib/puppettest.rb b/test/lib/puppettest.rb
index c8c8b077d..55a502b8c 100755
--- a/test/lib/puppettest.rb
+++ b/test/lib/puppettest.rb
@@ -11,10 +11,11 @@ module PuppetTest
                 @@basedir = File.dirname(Dir.getwd)
             else
                 dir = nil
-                if $0 =~ /^#{File::SEPARATOR}.+\.rb/
-                    dir = $0
+                app = $0.sub /^\.\//, ""
+                if app =~ /^#{File::SEPARATOR}.+\.rb/
+                    dir = app
                 else
-                    dir = File.join(Dir.getwd, $0)
+                    dir = File.join(Dir.getwd, app)
                 end
                 3.times { dir = File.dirname(dir) }
                 @@basedir = dir
diff --git a/test/other/autoload.rb b/test/other/autoload.rb
index d4f79668d..ea69d7f23 100755
--- a/test/other/autoload.rb
+++ b/test/other/autoload.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/autoload'
diff --git a/test/other/config.rb b/test/other/config.rb
index 9eed6b1e0..3b8c08ff8 100755
--- a/test/other/config.rb
+++ b/test/other/config.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/other/events.rb b/test/other/events.rb
index 4c3a2872f..a6d5d0e6c 100755
--- a/test/other/events.rb
+++ b/test/other/events.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/other/filetype.rb b/test/other/filetype.rb
index 02fcd0f71..efe90ef32 100755
--- a/test/other/filetype.rb
+++ b/test/other/filetype.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/filetype'
diff --git a/test/other/inifile.rb b/test/other/inifile.rb
index cd8a2e660..74a9dfba6 100755
--- a/test/other/inifile.rb
+++ b/test/other/inifile.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/inifile'
diff --git a/test/other/loadedfile.rb b/test/other/loadedfile.rb
index 4a1e3ea4e..117c967a2 100755
--- a/test/other/loadedfile.rb
+++ b/test/other/loadedfile.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/loadedfile'
diff --git a/test/other/log.rb b/test/other/log.rb
index e50a20e97..c341ace68 100755
--- a/test/other/log.rb
+++ b/test/other/log.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/log'
diff --git a/test/other/metrics.rb b/test/other/metrics.rb
index 8f487e200..049d00093 100755
--- a/test/other/metrics.rb
+++ b/test/other/metrics.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/metric'
 require 'puppet'
diff --git a/test/other/overrides.rb b/test/other/overrides.rb
index 035987e18..e25670291 100755
--- a/test/other/overrides.rb
+++ b/test/other/overrides.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/other/provider.rb b/test/other/provider.rb
index f886e6c58..9a9b00a70 100755
--- a/test/other/provider.rb
+++ b/test/other/provider.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/provider'
diff --git a/test/other/puppet.rb b/test/other/puppet.rb
index 8ffecaf3a..d8629f12a 100755
--- a/test/other/puppet.rb
+++ b/test/other/puppet.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/other/relationships.rb b/test/other/relationships.rb
index 59d81796a..893ef1ff4 100755
--- a/test/other/relationships.rb
+++ b/test/other/relationships.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/other/report.rb b/test/other/report.rb
index 16af66dde..945c5adc0 100755
--- a/test/other/report.rb
+++ b/test/other/report.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/transaction/report'
diff --git a/test/other/storage.rb b/test/other/storage.rb
index 7fcf82756..90b39df20 100755
--- a/test/other/storage.rb
+++ b/test/other/storage.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/other/transactions.rb b/test/other/transactions.rb
index 492043ffa..dc654994e 100755
--- a/test/other/transactions.rb
+++ b/test/other/transactions.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/providers/group.rb b/test/providers/group.rb
index 0f3886a66..7ff14f743 100755
--- a/test/providers/group.rb
+++ b/test/providers/group.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 'etc'
 require 'puppet/type'
diff --git a/test/providers/nameservice.rb b/test/providers/nameservice.rb
index 8260f6fa9..157cf83f2 100755
--- a/test/providers/nameservice.rb
+++ b/test/providers/nameservice.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 'puppettest'
 require 'puppet'
diff --git a/test/providers/package.rb b/test/providers/package.rb
index 638de489e..1b74e8aac 100755
--- a/test/providers/package.rb
+++ b/test/providers/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 'etc'
 require 'puppet/type'
diff --git a/test/providers/provider.rb b/test/providers/provider.rb
index dc6158566..bde265fff 100755
--- a/test/providers/provider.rb
+++ b/test/providers/provider.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 'puppettest'
 require 'puppet'
diff --git a/test/providers/user.rb b/test/providers/user.rb
index c8dc3e2e3..25579ece0 100755
--- a/test/providers/user.rb
+++ b/test/providers/user.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 'puppettest'
 require 'puppet'
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'
diff --git a/test/rails/rails.rb b/test/rails/rails.rb
index ed9a5bf3f..8be1bc66d 100755
--- a/test/rails/rails.rb
+++ b/test/rails/rails.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/rails'
diff --git a/test/rails/railsparameter.rb b/test/rails/railsparameter.rb
index a418633aa..2c974ff0e 100755
--- a/test/rails/railsparameter.rb
+++ b/test/rails/railsparameter.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/rails'
diff --git a/test/rails/railsresource.rb b/test/rails/railsresource.rb
index c9c178811..0dc70893b 100755
--- a/test/rails/railsresource.rb
+++ b/test/rails/railsresource.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/rails'
diff --git a/test/server/authconfig.rb b/test/server/authconfig.rb
index 961f880e8..3944369c1 100755
--- a/test/server/authconfig.rb
+++ b/test/server/authconfig.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/authconfig'
diff --git a/test/server/authstore.rb b/test/server/authstore.rb
index 2ac56602a..f591aa0c1 100755
--- a/test/server/authstore.rb
+++ b/test/server/authstore.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/authstore'
diff --git a/test/server/bucket.rb b/test/server/bucket.rb
index 06aa763d0..c8c6411c9 100755
--- a/test/server/bucket.rb
+++ b/test/server/bucket.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/server/ca.rb b/test/server/ca.rb
index fed4eebc6..81c73fe56 100755
--- a/test/server/ca.rb
+++ b/test/server/ca.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/ca'
diff --git a/test/server/fileserver.rb b/test/server/fileserver.rb
index f31cba8b4..00d235cb2 100755
--- a/test/server/fileserver.rb
+++ b/test/server/fileserver.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/fileserver'
diff --git a/test/server/logger.rb b/test/server/logger.rb
index a8cc9c8e9..6b7e6a8f4 100755
--- a/test/server/logger.rb
+++ b/test/server/logger.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/server/master.rb b/test/server/master.rb
index 01681030a..16b160c74 100755
--- a/test/server/master.rb
+++ b/test/server/master.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/server/pelement.rb b/test/server/pelement.rb
index 2d2e68491..24836e66c 100755
--- a/test/server/pelement.rb
+++ b/test/server/pelement.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/pelement'
diff --git a/test/server/report.rb b/test/server/report.rb
index 7076a79c4..7e563f9e6 100755
--- a/test/server/report.rb
+++ b/test/server/report.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/report'
diff --git a/test/server/rights.rb b/test/server/rights.rb
index 45c619616..cf0a3ed94 100755
--- a/test/server/rights.rb
+++ b/test/server/rights.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/rights'
diff --git a/test/server/runner.rb b/test/server/runner.rb
index be09f8563..daec78c4d 100755
--- a/test/server/runner.rb
+++ b/test/server/runner.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/runner'
diff --git a/test/server/server.rb b/test/server/server.rb
index 09a99c18e..03fedb93f 100755
--- a/test/server/server.rb
+++ b/test/server/server.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/tagging/tagging.rb b/test/tagging/tagging.rb
index aebf943f7..afab3faa4 100755
--- a/test/tagging/tagging.rb
+++ b/test/tagging/tagging.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/types/basic.rb b/test/types/basic.rb
index ae4c0140f..2e9a6be58 100755
--- a/test/types/basic.rb
+++ b/test/types/basic.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/types/component.rb b/test/types/component.rb
index 169e2c0fd..78f184eed 100755
--- a/test/types/component.rb
+++ b/test/types/component.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/types/cron.rb b/test/types/cron.rb
index abea96080..b91afe045 100755
--- a/test/types/cron.rb
+++ b/test/types/cron.rb
@@ -1,4 +1,6 @@
-#!/usr/bin/env ruby -I../lib -I../../lib
+#!/usr/bin/env ruby
+
+$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
 
 # Test cron job creation, modification, and destruction
 
diff --git a/test/types/exec.rb b/test/types/exec.rb
index 132cb71c6..53d343010 100755
--- a/test/types/exec.rb
+++ b/test/types/exec.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/types/file.rb b/test/types/file.rb
index 1b305dfee..027b52b81 100755
--- a/test/types/file.rb
+++ b/test/types/file.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 'fileutils'
diff --git a/test/types/filebucket.rb b/test/types/filebucket.rb
index 12837e9da..e95db2a41 100755
--- a/test/types/filebucket.rb
+++ b/test/types/filebucket.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 'fileutils'
diff --git a/test/types/fileignoresource.rb b/test/types/fileignoresource.rb
index a057df653..c012f9be1 100755
--- a/test/types/fileignoresource.rb
+++ b/test/types/fileignoresource.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 'cgi'
diff --git a/test/types/filesources.rb b/test/types/filesources.rb
index 155eac428..4c1139a0b 100755
--- a/test/types/filesources.rb
+++ b/test/types/filesources.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 'cgi'
diff --git a/test/types/group.rb b/test/types/group.rb
index 5f6a09385..c681b5bd0 100755
--- a/test/types/group.rb
+++ b/test/types/group.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 'etc'
 require 'puppet/type'
diff --git a/test/types/host.rb b/test/types/host.rb
index 08360c682..47cb00e67 100755
--- a/test/types/host.rb
+++ b/test/types/host.rb
@@ -1,4 +1,6 @@
-#!/usr/bin/env ruby -I../lib -I../../lib
+#!/usr/bin/env ruby
+
+$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
 
 # Test host job creation, modification, and destruction
 
diff --git a/test/types/mount.rb b/test/types/mount.rb
index 9530b9210..302e2376a 100755
--- a/test/types/mount.rb
+++ b/test/types/mount.rb
@@ -1,4 +1,6 @@
-#!/usr/bin/env ruby -I../lib -I../../lib
+#!/usr/bin/env ruby
+
+$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
 
 # Test host job creation, modification, and destruction
 
diff --git a/test/types/package.rb b/test/types/package.rb
index ca6d709a8..ea8648b88 100755
--- a/test/types/package.rb
+++ b/test/types/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 'puppettest'
 require 'puppet'
diff --git a/test/types/parameter.rb b/test/types/parameter.rb
index bb03eabec..603b56590 100755
--- a/test/types/parameter.rb
+++ b/test/types/parameter.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/type'
 require 'puppettest'
diff --git a/test/types/port.rb b/test/types/port.rb
index f0916cdcc..1537dc921 100755
--- a/test/types/port.rb
+++ b/test/types/port.rb
@@ -1,4 +1,6 @@
-#!/usr/bin/env ruby -I../lib -I../../lib
+#!/usr/bin/env ruby
+
+$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
 
 # Test host job creation, modification, and destruction
 
diff --git a/test/types/query.rb b/test/types/query.rb
index 87763dc20..a7ccb7f2e 100755
--- a/test/types/query.rb
+++ b/test/types/query.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/types/schedule.rb b/test/types/schedule.rb
index f9b7387e8..eb4931f2d 100755
--- a/test/types/schedule.rb
+++ b/test/types/schedule.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/type/schedule'
diff --git a/test/types/service.rb b/test/types/service.rb
index 93a729453..0433da9d6 100755
--- a/test/types/service.rb
+++ b/test/types/service.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/types/sshkey.rb b/test/types/sshkey.rb
index 0a0383d6b..5075ac88a 100755
--- a/test/types/sshkey.rb
+++ b/test/types/sshkey.rb
@@ -1,4 +1,6 @@
-#!/usr/bin/env ruby -I../lib -I../../lib
+#!/usr/bin/env ruby
+
+$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
 
 # Test key job creation, modification, and destruction
 
diff --git a/test/types/state.rb b/test/types/state.rb
index bc3676ed7..be4e8ae8c 100755
--- a/test/types/state.rb
+++ b/test/types/state.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/type'
 require 'puppettest'
diff --git a/test/types/symlink.rb b/test/types/symlink.rb
index cf3eb388b..4c6f3550f 100755
--- a/test/types/symlink.rb
+++ b/test/types/symlink.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/types/tidy.rb b/test/types/tidy.rb
index 2362faf7a..7bbc657cc 100755
--- a/test/types/tidy.rb
+++ b/test/types/tidy.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/types/type.rb b/test/types/type.rb
index e5d842ccb..a2c1bd068 100755
--- a/test/types/type.rb
+++ b/test/types/type.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/type'
 require 'puppettest'
diff --git a/test/types/user.rb b/test/types/user.rb
index f64a4c6d8..a3a2e14f0 100755
--- a/test/types/user.rb
+++ b/test/types/user.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 'etc'
 require 'puppet/type'
diff --git a/test/types/yumrepo.rb b/test/types/yumrepo.rb
index 3c7309a0d..72749a6fa 100755
--- a/test/types/yumrepo.rb
+++ b/test/types/yumrepo.rb
@@ -1,4 +1,6 @@
-#!/usr/bin/env ruby -I../lib -I../../lib
+#!/usr/bin/env ruby
+
+$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
 
 # Test the yumrepo type
 
diff --git a/test/types/zone.rb b/test/types/zone.rb
index 0af604ded..dfdcc90a4 100755
--- a/test/types/zone.rb
+++ b/test/types/zone.rb
@@ -1,4 +1,6 @@
-#!/usr/bin/env ruby -I../lib -I../../lib
+#!/usr/bin/env ruby
+
+$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
 
 # Test host job creation, modification, and destruction
 
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'