Bug 1275356 - Fix newlines in gen-css-properties.py on Windows; r=chmanchester
authorMike Shal <mshal@mozilla.com>
Tue, 24 May 2016 10:49:51 -0400
changeset 337987 2279a86a2dc34e928915aeebc3cbdeb0bb9b8d9d
parent 337986 8b5b058bf71fb886d8308496a80d66e8f407e8e1
child 337988 37be4f51e6b4cb200cc714e0a3185276998d3f07
push id6249
push userjlund@mozilla.com
push dateMon, 01 Aug 2016 13:59:36 +0000
treeherdermozilla-beta@bad9d4f5bf7e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerschmanchester
bugs1275356
milestone49.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1275356 - Fix newlines in gen-css-properties.py on Windows; r=chmanchester MozReview-Commit-ID: 9BDStGNIEqg
layout/style/test/gen-css-properties.py
--- a/layout/style/test/gen-css-properties.py
+++ b/layout/style/test/gen-css-properties.py
@@ -7,15 +7,18 @@ from __future__ import print_function
 import os
 import sys
 import subprocess
 
 def main(output, css_properties, exe):
     # moz.build passes in the exe name without any path, so to run it we need to
     # prepend the './'
     run_exe = exe if os.path.isabs(exe) else './%s' % exe
-    data = subprocess.check_output([run_exe])
+
+    # Use universal_newlines so everything is '\n', which gets converted to
+    # '\r\n' when writing out the file in Windows.
+    data = subprocess.check_output([run_exe], universal_newlines=True)
     with open(css_properties) as f:
         data += f.read()
     output.write(data)
 
 if __name__ == '__main__':
     main(sys.stdout, *sys.argv[1:])