summaryrefslogtreecommitdiffstats
path: root/chromium/testing/scripts/check_static_initializers.py
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/testing/scripts/check_static_initializers.py')
-rwxr-xr-xchromium/testing/scripts/check_static_initializers.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/chromium/testing/scripts/check_static_initializers.py b/chromium/testing/scripts/check_static_initializers.py
index 3afd112883b..d5351e74925 100755
--- a/chromium/testing/scripts/check_static_initializers.py
+++ b/chromium/testing/scripts/check_static_initializers.py
@@ -64,7 +64,7 @@ COVERAGE_BUILD_FALLBACK_EXPECTED_MAC_SI_COUNT = 4
def run_process(command):
- p = subprocess.Popen(command, stdout=subprocess.PIPE)
+ p = subprocess.Popen(command, stdout=subprocess.PIPE, universal_newlines=True)
stdout = p.communicate()[0]
if p.returncode != 0:
raise Exception(
@@ -205,7 +205,7 @@ def main_run(args):
if sys.platform.startswith('darwin'):
rc = main_mac(src_dir,
allow_coverage_initializer = '--allow-coverage-initializer' in args.args)
- elif sys.platform == 'linux2':
+ elif sys.platform.startswith('linux'):
is_chromeos = 'buildername' in args.properties and \
'chromeos' in args.properties['buildername']
rc = main_linux(src_dir, is_chromeos)
@@ -222,7 +222,7 @@ def main_run(args):
def main_compile_targets(args):
if sys.platform.startswith('darwin'):
compile_targets = ['chrome']
- elif sys.platform == 'linux2':
+ elif sys.platform.startswith('linux'):
compile_targets = ['chrome', 'nacl_helper', 'nacl_helper_bootstrap']
else:
compile_targets = []