Wrangle paths so finally lighttpd should start everything on all platforms correctly

4 files changed, 5 insertions, 8 deletions

diff --git a/test/cgi/test.fcgi b/test/cgi/test.fcgi
index 952ac4b5..5e104fc9 100755
--- a/test/cgi/test.fcgi
+++ b/test/cgi/test.fcgi
@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 # -*- ruby -*-
 
+$:.unshift '../../lib'
 require 'rack'
 require '../testrequest'
 
diff --git a/test/cgi/test.ru b/test/cgi/test.ru
index c155d088..4054b886 100755
--- a/test/cgi/test.ru
+++ b/test/cgi/test.ru
@@ -1,5 +1,5 @@
-#!/usr/local/bin/ruby ../../bin/rackup
-#\ -E deployment -I ~/projects/rack/lib
+#!/usr/bin/env ../../bin/rackup
+#\ -E deployment -I ../../lib
 # -*- ruby -*-
 
 require '../testrequest'
diff --git a/test/spec_rack_cgi.rb b/test/spec_rack_cgi.rb
index 9914ed75..331f9886 100644
--- a/test/spec_rack_cgi.rb
+++ b/test/spec_rack_cgi.rb
@@ -12,9 +12,7 @@ context "Rack::Handler::CGI" do
   # Keep this first.
   specify "startup" do
     $pid = fork {
-      rack_home = File.expand_path(File.join(File.dirname(__FILE__), ".."))
-      ENV['RUBYLIB'] = File.join(rack_home, "lib")
-      Dir.chdir(File.join(rack_home, "test", "cgi"))
+      Dir.chdir(File.join(File.dirname(__FILE__), "..", "test", "cgi"))
       exec "lighttpd -D -f lighttpd.conf"
     }
   end
diff --git a/test/spec_rack_fastcgi.rb b/test/spec_rack_fastcgi.rb
index c2ff9580..66ab4f79 100644
--- a/test/spec_rack_fastcgi.rb
+++ b/test/spec_rack_fastcgi.rb
@@ -12,9 +12,7 @@ context "Rack::Handler::FastCGI" do
   # Keep this first.
   specify "startup" do
     $pid = fork {
-      rack_home = File.expand_path(File.join(File.dirname(__FILE__), ".."))
-      ENV['RUBYLIB'] = File.join(rack_home, "lib")
-      Dir.chdir(File.join(rack_home, "test", "cgi"))
+      Dir.chdir(File.join(File.dirname(__FILE__), "..", "test", "cgi"))
       exec "lighttpd -D -f lighttpd.conf"
     }
   end