brew-test-bot: cleanup junit file with iconv.

1 files changed, 8 insertions, 3 deletions

diff --git a/Library/Contributions/cmd/brew-test-bot.rb b/Library/Contributions/cmd/brew-test-bot.rb
index f035eddef..0488bc24f 100755
--- a/Library/Contributions/cmd/brew-test-bot.rb
+++ b/Library/Contributions/cmd/brew-test-bot.rb
@@ -397,10 +397,15 @@ end
 if ARGV.include? "--junit"
   xml_erb = HOMEBREW_CONTRIBUTED_CMDS + "brew-test-bot.xml.erb"
   erb = ERB.new IO.read xml_erb
-  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/, '')
+  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/, '')
   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"