summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2009-04-02 19:34:38 -0500
committerLuke Kanies <luke@madstop.com>2009-04-02 19:34:38 -0500
commite016307f00fe67dc53f8581f08c1dfb5ab7dfb3b (patch)
treeca941ed25259dbc89654be729bc5f562f68943cd /test
parent6e79cc00965a50c44f215fd1e553281cfd2b87c9 (diff)
downloadpuppet-e016307f00fe67dc53f8581f08c1dfb5ab7dfb3b.tar.gz
puppet-e016307f00fe67dc53f8581f08c1dfb5ab7dfb3b.tar.xz
puppet-e016307f00fe67dc53f8581f08c1dfb5ab7dfb3b.zip
Fixing Rakefile; apparently there was a rake or gem incompatibility
Signed-off-by: Luke Kanies <luke@madstop.com>
Diffstat (limited to 'test')
-rw-r--r--test/Rakefile7
1 files 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