From e016307f00fe67dc53f8581f08c1dfb5ab7dfb3b Mon Sep 17 00:00:00 2001 From: Luke Kanies Date: Thu, 2 Apr 2009 19:34:38 -0500 Subject: Fixing Rakefile; apparently there was a rake or gem incompatibility Signed-off-by: Luke Kanies --- test/Rakefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/test/Rakefile b/test/Rakefile index a8118c1c5..a1f8c26ec 100644 --- a/test/Rakefile +++ b/test/Rakefile @@ -55,7 +55,7 @@ end desc "Run the full test suite" Rake::PuppetTestTask.new :test do |t| - t.libs << $test_library_paths + t.libs += $test_library_paths # Add every file as a test file to run t.test_files = allfiles @@ -72,7 +72,8 @@ filemap.each do |dir, files| namespace ns do files.each do |file| Rake::PuppetTestTask.new File.basename(file, '.rb').to_sym do |t| - t.libs << $test_library_paths + ['..'] + t.libs += $test_library_paths + ['..'] + t.libs << '..' t.test_files = [ file ] t.verbose = true end @@ -81,7 +82,7 @@ filemap.each do |dir, files| # Then create a task that matches the directory itself. Rake::PuppetTestTask.new dir do |t| - t.libs << $test_library_paths + t.libs += $test_library_paths if ENV["TESTFILES"] t.test_files = ENV["TESTFILES"].split(/\s+/) else -- cgit