Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(803)

Unified Diff: mojo/tools/mopy/gn_unittest.py

Issue 1124763003: Update from https://crrev.com/327068 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: update nacl, buildtools, fix display_change_notifier_unittest Created 5 years, 7 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:
View side-by-side diff with in-line comments
Download patch
Index: mojo/tools/mopy/gn_unittest.py
diff --git a/mojo/tools/mopy/gn_unittest.py b/mojo/tools/mopy/gn_unittest.py
index 1aaaa6c94fd45fc99d73b61f5c5fc7065afed37a..0e8768a71223199970851a29b4716ee5f6b0dff8 100644
--- a/mojo/tools/mopy/gn_unittest.py
+++ b/mojo/tools/mopy/gn_unittest.py
@@ -37,7 +37,7 @@ class GTestListTestsTest(unittest.TestCase):
def testGNToConfigToGN(self):
"""Tests that gn to config to gn is the identity"""
configs_to_test = {
- "os": [None, "android", "chromeos"],
+ "target_os": [None, "android", "chromeos"],
"target_cpu": ["x86", "x64", "arm"],
"is_debug": [False, True],
"is_clang": [False, True],
@@ -49,10 +49,10 @@ class GTestListTestsTest(unittest.TestCase):
}
for args in _iterate_over_config(configs_to_test):
- if args.get('os', None) == "chromeos":
- args['use_glib'] = False
- args['use_system_harfbuzz'] = False
- if args.get('os', None) is None and sys.platform[:5] == 'linux':
+ if args.get("target_os", None) == "chromeos":
+ args["use_glib"] = False
+ args["use_system_harfbuzz"] = False
+ if args.get("target_os", None) is None and sys.platform[:5] == "linux":
args["use_aura"] = False
args["use_glib"] = False
args["use_system_harfbuzz"] = False

Powered by Google App Engine
This is Rietveld 408576698