summaryrefslogtreecommitdiffstats
path: root/autotest
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2009-01-15 11:41:51 -0600
committerLuke Kanies <luke@madstop.com>2009-01-15 11:41:51 -0600
commit074eda99ffd186a667ec3f50fbb6d4e267f585cb (patch)
tree288b032fdc1e3ece1c118499e2987f22c47d558c /autotest
parent01754f6e42222147b751264d5ca7f0e03f250c1c (diff)
downloadfacter-074eda99ffd186a667ec3f50fbb6d4e267f585cb.tar.gz
facter-074eda99ffd186a667ec3f50fbb6d4e267f585cb.tar.xz
facter-074eda99ffd186a667ec3f50fbb6d4e267f585cb.zip
Fixing autotest, now that vendor/ is gone
Signed-off-by: Luke Kanies <luke@madstop.com>
Diffstat (limited to 'autotest')
-rw-r--r--autotest/facter_rspec.rb18
1 files changed, 4 insertions, 14 deletions
diff --git a/autotest/facter_rspec.rb b/autotest/facter_rspec.rb
index bd057a8..668409b 100644
--- a/autotest/facter_rspec.rb
+++ b/autotest/facter_rspec.rb
@@ -38,18 +38,8 @@ Autotest.add_hook :initialize do |at|
end
class Autotest::FacterRspec < Autotest::Rspec
- # Autotest will look for spec commands in the following
- # locations, in this order:
- #
- # * bin/spec
- # * default spec bin/loader installed in Rubygems
- # * our local vendor/gems/rspec/bin/spec
- def spec_commands
- [
- File.join('vendor', 'gems', 'rspec', 'bin', 'spec') ,
- File.join('bin', 'spec'),
- File.join(Config::CONFIG['bindir'], 'spec')
- ]
- end
-
+ def spec_commands
+ ENV["AUTOTEST"] = "true"
+ ENV["PATH"].split(":").collect { |dir| File.join(dir, "spec") }
+ end
end