Added test_files= to test tasks.

git-svn-id: svn+ssh://rubyforge.org/var/svn/rake/trunk@244 5af023f1-ac1a-0410-98d6-829a145c37ef

rake/lib/rake/testtask.rb

@@ -36,31 +36,45 @@ class TestTask < TaskLib
     def initialize(name=:test)
       @name = name
       @libs = ["lib"]
-      @pattern = 'test/test*.rb'
+      @pattern = nil
+      @test_files = nil
       @verbose = false
       yield self if block_given?
+      @pattern = 'test/test*.rb' if @pattern.nil? && @test_files.nil?
       define
     end
 
     # Create the tasks defined by this task lib.
     def define
       lib_path = @libs.join(':')
-      testfiles = FileList[ ENV['TEST'] || @pattern ]
       if ENV['TESTOPTS']
 	testoptions = " \\\n -- #{ENV['TESTOPTS']}"
       else
 	testoptions = ''
       end
       desc "Run tests" + (@name==:test ? "" : " for #{@name}")
       task @name do
-	testreqs = testfiles.gsub(/^(.*)\.rb$/, ' -r\1').join(" \\\n")
-	ruby %{-I#{lib_path} -e0 \\\n#{testreqs}#{testoptions}}
+	testreqs = test_file_list.gsub(/^(.*)\.rb$/, ' -r\1').join(" \\\n")
+	RakeFileUtils.verbose(@verbose) do
+	  ruby %{-I#{lib_path} -e0 \\\n#{testreqs}#{testoptions}}
+	end
       end
       self
     end
 
-    def running_as_gem
-      $LOAD_PATH.find { |fn| fn =~ %r{gems/.*/rake} } != nil
+    def test_files=(list)
+      @test_files = list
+    end
+
+    def test_file_list
+      if ENV['TEST']
+	FileList[ ENV['TEST'] ]
+      else
+	result = []
+	result += @test_files.to_a if @test_files
+	result += FileList[ @pattern ].to_a if @pattern
+	FileList[result]
+      end
     end
 
   end