0
@@ -23,7 +23,7 @@ LDFLAGS = ""
0
 
0
 desc "Build everything"
0
 task :default => [
0
-	"ext/mod_rails/native_support.#{LIBEXT}",
0
+	:native_support,
0
   :apache2,
0
   'test/Apache2ModuleTests',
0
   'benchmark/DummyRequestHandler'
0
@@ -39,6 +39,8 @@ task :clobber
0
 ##### Ruby C extension
0
 
0
 subdir 'ext/mod_rails' do
0
+	task :native_support => ["native_support.#{LIBEXT}"]
0
+	
0
   file 'Makefile' => 'extconf.rb' do
0
     sh "ruby extconf.rb"
0
   end
0
@@ -92,7 +94,7 @@ subdir 'ext/apache2' do
0
   apxs_objects = APACHE2::OBJECTS.keys.join(',')
0
 
0
   desc "Build mod_passenger Apache 2 module"
0
-	task :apache2 => ['mod_passenger.so', "../mod_rails/native_support.#{LIBEXT}"]
0
+	task :apache2 => ['mod_passenger.so', :native_support]
0
   
0
   file 'mod_passenger.so' => ['../boost/src/libboost_thread.a', 'mod_passenger.o'] + APACHE2::OBJECTS.keys do
0
     # apxs totally sucks. We couldn't get it working correctly
0
@@ -177,26 +179,30 @@ end
0
 
0
 subdir 'test' do
0
   desc "Run all unit tests (but not integration tests)"
0
-	task :test => [:'test:apache2', :'test:ruby']
0
+	task :test => [:'test:apache2', :'test:ruby', :'test:integration']
0
   
0
   desc "Run unit tests for the Apache 2 module"
0
-	task 'test:apache2' => 'Apache2ModuleTests' do
0
+	task 'test:apache2' => ['Apache2ModuleTests', :native_support] do
0
     sh "./Apache2ModuleTests"
0
   end
0
   
0
   desc "Run unit tests for the Apache 2 module in Valgrind"
0
-	task 'test:valgrind' => 'Apache2ModuleTests' do
0
+	task 'test:valgrind' => ['Apache2ModuleTests', :native_support] do
0
     sh "valgrind #{ENV['ARGS']} ./Apache2ModuleTests"
0
   end
0
   
0
   desc "Run unit tests for the Ruby libraries"
0
-	task 'test:ruby' => ["../ext/mod_rails/native_support.#{LIBEXT}"] do
0
+	task 'test:ruby' => [:native_support] do
0
     sh "spec -f s *_spec.rb"
0
   end
0
+	
0
+	desc "Run integration tests"
0
+	task 'test:integration' => [:apache2, :native_support] do
0
+		sh "spec -f s integration_tests.rb"
0
+	end
0
 
0
   file 'Apache2ModuleTests' => TEST::AP2_OBJECTS.keys +
0
     ['../ext/boost/src/libboost_thread.a',
0
-	   "../ext/mod_rails/native_support.#{LIBEXT}",
0
      '../ext/apache2/Utils.o'] do
0
     objects = TEST::AP2_OBJECTS.keys.join(' ') << " ../ext/apache2/Utils.o"
0
     create_executable "Apache2ModuleTests", objects,