more

Author: abarth

.travis.yml

@@ -1,4 +1,4 @@
-language: dart
+language: cpp
 sudo: required
 before_install:
   - ./travis/before_install.sh

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']

travis/build.sh

@@ -1,6 +1,10 @@
 #!/bin/bash
 set -ex
 
+# Linux Debug
+./sky/tools/gn --debug --no-clang
+ninja -j 8 -C out/Debug
+
 ./tools/android/download_android_tools.py
 
 # Android Debug

travis/setup.sh

@@ -5,8 +5,11 @@ set -ex
 git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git
 export PATH="$(pwd)/depot_tools:${PATH}"
 
+sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
+sudo apt-get update -qq
+
 # Get dependencies.
-sudo apt-get install libdbus-1-dev libgconf2-dev bison gperf wdiff python-openssl libxtst-dev
+sudo apt-get install libdbus-1-dev libgconf2-dev bison gperf wdiff python-openssl libxtst-dev gcc-4.8 g++-4.8
 sudo easy_install pip
 sudo pip install requests