diff options
| author | Mike McQuaid | 2013-10-08 13:00:27 +0100 |
|---|---|---|
| committer | Mike McQuaid | 2013-10-08 13:00:27 +0100 |
| commit | 85c1e5d02e9b136e25ea5a5fd0cae79ace73cbf6 (patch) | |
| tree | 2ce256eec29bb74d5de834d219d7395bee2eef2c | |
| parent | 90b7cfb5075af573b74752bddd7f40f3cce5c9de (diff) | |
| download | brew-85c1e5d02e9b136e25ea5a5fd0cae79ace73cbf6.tar.bz2 | |
Revert "brew-test-bot: cleanup junit file with iconv."
This reverts commit 5e26584736b310c365d4b9cce99d0dced9a2d309.
| -rwxr-xr-x | Library/Contributions/cmd/brew-test-bot.rb | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/Library/Contributions/cmd/brew-test-bot.rb b/Library/Contributions/cmd/brew-test-bot.rb index 0488bc24f..f035eddef 100755 --- a/Library/Contributions/cmd/brew-test-bot.rb +++ b/Library/Contributions/cmd/brew-test-bot.rb @@ -397,15 +397,10 @@ end if ARGV.include? "--junit" xml_erb = HOMEBREW_CONTRIBUTED_CMDS + "brew-test-bot.xml.erb" erb = ERB.new IO.read xml_erb - output_xml = 'brew-test-bot.xml' - input_xml = "#{output_xml}.in" - open("brew-test-bot.xml.in", "w") do |xml| - # Remove empty lines from ERB result. - xml.write erb.result(binding).gsub(/^\s*$\n/, '') + open("brew-test-bot.xml", "w") do |xml| + # Remove empty lines and null characters from ERB result. + xml.write erb.result(binding).gsub(/^\s*$\n|\000/, '') end - # Remove bad characters from ERB result. - `iconv -c -s -f utf8 -t utf8 #{input_xml} > #{output_xml}` - FileUtils.rm input_xml end if ARGV.include? "--email" |
