Permalink
Browse files

Wrangle paths so finally lighttpd should start everything on all plat…

…forms correctly
  • Loading branch information...
1 parent 848d181 commit 54c5b1b19e73793395828ae94fdf8951e23e45ea @chneukirchen committed Aug 9, 2008
Showing with 5 additions and 8 deletions.
  1. +1 −0 test/cgi/test.fcgi
  2. +2 −2 test/cgi/test.ru
  3. +1 −3 test/spec_rack_cgi.rb
  4. +1 −3 test/spec_rack_fastcgi.rb
View
@@ -1,6 +1,7 @@
#!/usr/bin/env ruby
# -*- ruby -*-
+$:.unshift '../../lib'
require 'rack'
require '../testrequest'
View
@@ -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'
View
@@ -12,9 +12,7 @@
# 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
@@ -12,9 +12,7 @@
# 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

0 comments on commit 54c5b1b

Please sign in to comment.