Bug 1275356 - Fix newlines in gen-css-properties.py on Windows; r?chmanchester
MozReview-Commit-ID: 9BDStGNIEqg
--- 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:])