0
@@ -174,6 +174,19 @@ class TEST
0
 end
0
 
0
 subdir 'test' do
0
+	desc "Run all unit tests"
0
+	task :test => ['test:apache2'.to_sym, 'test:ruby'.to_sym]
0
+	
0
+	desc "Run unit tests for the Apache 2 module"
0
+	task 'test:apache2' => 'Apache2ModuleTests' do
0
+		sh "./Apache2ModuleTests"
0
+	end
0
+	
0
+	desc "Run unit tests for the Ruby libraries"
0
+	task 'test:ruby' do
0
+		sh "spec -f s *_spec.rb"
0
+	end
0
+
0
   file 'Apache2ModuleTests' => TEST::AP2_OBJECTS.keys + ['../ext/boost/src/libboost_thread.a'] do
0
     objects = TEST::AP2_OBJECTS.keys.join(' ')
0
     create_executable "Apache2ModuleTests", objects,

0
@@ -94,9 +94,10 @@ module Rake
0
       task paste(name, ":force") => [paste("clobber_", name), name]
0
       
0
       desc "Remove rdoc products" 
0
-      task paste(name, ":clobber") do
0
+      task paste(name, ":clean") do
0
         rm_r rdoc_dir rescue nil
0
       end
0
+      task :clean => paste(name, ":clean")
0
 
0
       task :clobber => [paste(name, ":clobber")]
0