Merge pull request #52 from google/update_macros

Improve travis ci

.travis.yml

@@ -6,41 +6,47 @@ cache:
   directories:
     - $HOME/cpu_features_archives
 
+addons:
+  apt:
+    packages:
+    - ninja-build
+
+env:
+  global:
+    TOOLCHAIN=NATIVE
+    CMAKE_GENERATOR=Ninja
+
 matrix:
   include:
   - os: linux
     compiler: gcc
     env:
-      TOOLCHAIN=NATIVE
       TARGET=x86_64-linux-gnu
   - os: linux
     compiler: clang
     env:
-      TOOLCHAIN=NATIVE
       TARGET=x86_64-linux-gnu
   - os: osx
     compiler: gcc
     env:
-      TOOLCHAIN=NATIVE
       TARGET=x86_64-osx
+      CMAKE_GENERATOR="Unix Makefiles"
   - os: osx
     compiler: clang
     env:
-      TOOLCHAIN=NATIVE
       TARGET=x86_64-osx
+      CMAKE_GENERATOR="Unix Makefiles"
   - os: windows
     env:
-      TOOLCHAIN=NATIVE
       TARGET=x86_64-windows
+      CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
   - os: linux-ppc64le
     compiler: gcc
     env:
-      TOOLCHAIN=NATIVE
       TARGET=ppc64le-linux-gnu
   - os: linux-ppc64le
     compiler: clang
     env:
-      TOOLCHAIN=NATIVE
       TARGET=ppc64le-linux-gnu
   # Toolchains for little-endian, 64-bit ARMv8 for GNU/Linux systems
   - os: linux

scripts/run_integration.sh

@@ -88,7 +88,7 @@ function integrate() {
   esac
 
   # Generating CMake configuration
-  cmake -H. -B"${BUILD_DIR}" ${DEFAULT_CMAKE_ARGS} ${CMAKE_ADDITIONAL_ARGS}
+  cmake -H. -B"${BUILD_DIR}" ${DEFAULT_CMAKE_ARGS} ${CMAKE_ADDITIONAL_ARGS} -G"${CMAKE_GENERATOR:-Unix Makefiles}"
 
   # Building
   cmake --build "${BUILD_DIR}" ${CMAKE_BUILD_ARGS}
@@ -97,17 +97,15 @@ function integrate() {
   if [[ "${QEMU_ARCH}" == "DISABLED" ]]; then
     return
   fi
+  RUN_CMD=""
   if [[ -n "${QEMU_ARCH}" ]]; then
     installqemuifneeded
-    QEMU="${QEMU_INSTALL}/bin/qemu-${QEMU_ARCH} ${QEMU_ARGS}"
-    for test_binary in ${BUILD_DIR}/test/*_test; do
-      ${QEMU} ${test_binary}
-    done
-    ${QEMU} ${DEMO}
-  else
-    cmake --build "${BUILD_DIR}" ${CMAKE_TEST_ARGS}
-    ${DEMO}
+    RUN_CMD="${QEMU_INSTALL}/bin/qemu-${QEMU_ARCH} ${QEMU_ARGS}"
   fi
+  for test_binary in ${BUILD_DIR}/test/*_test; do
+    ${RUN_CMD} ${test_binary} &
+  done
+  ${RUN_CMD} ${DEMO}
 }
 
 function expand_linaro_config() {