diff options
| author | Luke Kanies <luke@puppetlabs.com> | 2011-04-09 15:04:23 -0700 |
|---|---|---|
| committer | Luke Kanies <luke@puppetlabs.com> | 2011-04-09 19:31:50 -0700 |
| commit | 69db81746fee54e14ee3e46f2fc31e93c096d529 (patch) | |
| tree | 8bc3934ddcd00eabdc365d10c6d4bcc9f687c66c | |
| parent | 8ec9d13b7e6885c2d18bc3b7c69a83ce5bf2f353 (diff) | |
| download | puppet-69db81746fee54e14ee3e46f2fc31e93c096d529.tar.gz puppet-69db81746fee54e14ee3e46f2fc31e93c096d529.tar.xz puppet-69db81746fee54e14ee3e46f2fc31e93c096d529.zip | |
Fixing the watchr script
It had not been updated for quite a while.
Signed-off-by: Luke Kanies <luke@puppetlabs.com>
Reviewed-by: Daniel Pittman <daniel@puppetlabs.com>
| -rw-r--r-- | spec/spec.opts | 2 | ||||
| -rw-r--r-- | spec/watchr.rb (renamed from autotest/watcher.rb) | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/spec/spec.opts b/spec/spec.opts index 91cd6427e..425f0edd3 100644 --- a/spec/spec.opts +++ b/spec/spec.opts @@ -1,6 +1,4 @@ --format s --colour ---loadby -mtime --backtrace diff --git a/autotest/watcher.rb b/spec/watchr.rb index 9f89a448c..bad89b088 100644 --- a/autotest/watcher.rb +++ b/spec/watchr.rb @@ -47,7 +47,7 @@ end def file2specs(file) %w{spec/unit spec/integration}.collect { |d| - file.sub('lib/puppet', d) + file.sub('lib/puppet', d).sub(".rb", "_spec.rb") }.find_all { |f| File.exist?(f) } @@ -81,7 +81,7 @@ def run_spec_files(files) files = Array(files) return if files.empty? opts = File.readlines('spec/spec.opts').collect { |l| l.chomp }.join(" ") - run_spec("spec #{files.join(' ')}") + run_spec("rspec #{opts} --tty #{files.join(' ')}") end def run_all_tests |