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

11 files changed, 33 insertions, 11 deletions

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'