test/make_global_settings/basics/gyptest-make_global_settings.py - Issue 1454433002: Python 3 compatibility

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: test/make_global_settings/basics/gyptest-make_global_settings.py

Issue 1454433002: Python 3 compatibility Base URL: https://chromium.googlesource.com/external/gyp.git@master

Patch Set: Rebase with master (4ec6c4e3a94bd04a6da2858163d40b2429b8aad1) Created 4 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: test/make_global_settings/basics/gyptest-make_global_settings.py

diff --git a/test/make_global_settings/basics/gyptest-make_global_settings.py b/test/make_global_settings/basics/gyptest-make_global_settings.py

index 63d1d0af90facb6f6db39932edf5d297bfe68ce4..b146f27cdd2c14aec23dc10d1d3c155f712113dd 100644

--- a/test/make_global_settings/basics/gyptest-make_global_settings.py

+++ b/test/make_global_settings/basics/gyptest-make_global_settings.py

@@ -13,7 +13,7 @@ import sys

import TestGyp

test_format = ['ninja']

-if sys.platform in ('linux2', 'darwin'):

+if sys.platform.startswith('linux') or sys.platform == 'darwin':

test_format += ['make']

test = TestGyp.TestGyp(formats=test_format)

@@ -25,7 +25,7 @@ if test.format == 'make':

CC = $(abspath clang)

endif

"""

- if sys.platform == 'linux2':

+ if sys.platform.startswith('linux'):

link_expected = """

LINK ?= $(abspath clang)

"""