From 6450c53c9313f2a425bc3a4aca2a2a5bcad3f5c8 Mon Sep 17 00:00:00 2001 From: Adam Barth Date: Fri, 17 Jul 2015 23:34:38 -0700 Subject: [PATCH] Improve Travis reliability Previously, we were using too many parallel instances of $CXX, which caused crashes. Now we use -j 2, which seems to work. Also, use fewer processes during testing. --- engine/src/flutter/.travis.yml | 2 +- engine/src/flutter/sky/tools/gn | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/engine/src/flutter/.travis.yml b/engine/src/flutter/.travis.yml index 9bd2f98f5e2..113994f5248 100644 --- a/engine/src/flutter/.travis.yml +++ b/engine/src/flutter/.travis.yml @@ -1,4 +1,4 @@ -language: dart +language: cpp sudo: required before_install: - ./travis/before_install.sh diff --git a/engine/src/flutter/sky/tools/gn b/engine/src/flutter/sky/tools/gn index 1fe6328f35b..8a2c98c399f 100755 --- a/engine/src/flutter/sky/tools/gn +++ b/engine/src/flutter/sky/tools/gn @@ -29,7 +29,7 @@ def to_gn_args(args): gn_args = {} gn_args["is_debug"] = args.debug - gn_args["is_clang"] = args.target_os not in ['android'] + gn_args["is_clang"] = args.clang and args.target_os not in ['android'] if args.target_os == 'android': gn_args["target_os"] = "android" @@ -79,6 +79,9 @@ def main(): parser.add_argument('--goma', default=True, action='store_true') parser.add_argument('--no-goma', dest='goma', action='store_false') + parser.add_argument('--clang', default=True, action='store_true') + parser.add_argument('--no-clang', dest='clang', action='store_false') + args = parser.parse_args() command = ['gn', 'gen', '--check']