espressif/Unity
1
0
Fork 0
mirror of https://github.com/ThrowTheSwitch/Unity.git synced 2025-08-06 13:50:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Another round of fixing things that the stylizer “corrected” for me.

Browse Source
This commit is contained in:
Mark VanderVoord
2017-03-28 08:59:58 -04:00
parent 3a6cca39c5
commit 23f9c16aaa
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
extras/fixture/rakefile_helper.rb
View File

@ -16,7 +16,7 @@ module RakefileHelpers
def load_configuration(config_file) def load_configuration(config_file)
unless $configured unless $configured
$cfg_file = HERE + "../../test/targets/#{config_file}" unless config_file =~ /[\\|\/]/ $cfg_file = HERE + "../../test/targets/#{config_file}" unless config_file =~ /[\\|\/]/
$cfg = YAML.safe_load(File.read($cfg_file)) $cfg = YAML.load(File.read($cfg_file))
$colour_output = false unless $cfg['colour'] $colour_output = false unless $cfg['colour']
$configured = true if config_file != DEFAULT_CONFIG_FILE $configured = true if config_file != DEFAULT_CONFIG_FILE
end end
@ -120,7 +120,7 @@ module RakefileHelpers
report command_string report command_string
output = `#{command_string}`.chomp output = `#{command_string}`.chomp
report(output) if verbose && !output.nil? && !output.empty? report(output) if verbose && !output.nil? && !output.empty?
raise "Command failed. (Returned #{$CHILD_STATUS.exitstatus})" if $CHILD_STATUS.exitstatus != 0 raise "Command failed. (Returned #{$?.exitstatus})" if $?.exitstatus != 0
output output
end end