Fix Apache 2 integration tests

phusion · Dec 20, 2011 · 1d7ea01 · 1d7ea01
1 parent a30c1e3
commit 1d7ea01
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/build/basics.rb b/build/basics.rb
@@ -24,6 +24,7 @@
 require 'rubygems'
 require 'pathname'
 require 'phusion_passenger'
+PhusionPassenger.locate_directories
 require 'phusion_passenger/packaging'
 require 'phusion_passenger/platform_info'
 require 'phusion_passenger/platform_info/operating_system'

diff --git a/test/integration_tests/spec_helper.rb b/test/integration_tests/spec_helper.rb
@@ -15,5 +15,6 @@
 $LOAD_PATH.unshift("#{source_root}/test")
 
 require 'phusion_passenger'
+PhusionPassenger.locate_directories
 require 'support/test_helper'
 include TestHelper
diff --git a/test/support/apache2_controller.rb b/test/support/apache2_controller.rb
@@ -70,8 +70,8 @@ def initialize(options = nil)
 		@vhosts = []
 		@extra = []
 		@server_root = File.expand_path('tmp.apache2')
-		@passenger_root = File.expand_path(File.dirname(__FILE__) + "/../..")
-		@mod_passenger = File.expand_path(File.dirname(__FILE__) + "/../../ext/apache2/mod_passenger.so")
+		@passenger_root = File.expand_path(PhusionPassenger.root)
+		@mod_passenger = File.expand_path(PhusionPassenger.root + "/libout/apache2/mod_passenger.so")
 	end
 
 	def set(options)