Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

show extended output on testtask fail only with verbose or trace #163

Merged
merged 2 commits into from
Sep 20, 2016
Merged

show extended output on testtask fail only with verbose or trace #163

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
21130fe
show extended output on testtask fail only with verbose or trace
bretts Sep 20, 2016
b878500
updates based on comments from drbrain
bretts Sep 20, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions lib/rake/testtask.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,9 @@ def define
if !ok && status.respond_to?(:signaled?) && status.signaled?
raise SignalException.new(status.termsig)
elsif !ok
fail "Command failed with status (#{status.exitstatus}): " +
"[ruby #{args}]"
status = "Command failed with status (#{status.exitstatus})"
details = ": [ruby #{args}]"
fail (ARGV.include?('--trace') || @verbose) ? (status + details) : status
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ARGV may no longer include '--trace' by the time we get here (Rakefile authors may change it). Switching to Rake.application.options.trace will keep this value.

Also, can you do one thing per line so this is easier to maintain? Like this:

message =
  if Rake.application.options.trace or @verbose then
    status + details
  else
    status
  end

fail message

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sounds good, thanks!

end
end
end
Expand Down