From 317edf860bb607b5ef44e587f6bd78e212f677d2 Mon Sep 17 00:00:00 2001
From: Guillaume Chatelet <gchatelet@google.com>
Date: Thu, 17 Jan 2019 14:03:37 +0100
Subject: [PATCH 01/12] Allow specifying cmake generator.

---
 .travis.yml                | 6 ++++++
 scripts/run_integration.sh | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index c293742..79e11f0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,6 +32,12 @@ matrix:
     env:
       TOOLCHAIN=NATIVE
       TARGET=x86_64-windows
+      CMAKE_GENERATOR="Visual Studio 14 2015 Win64"
+  - os: windows
+    env:
+      TOOLCHAIN=NATIVE
+      TARGET=x86_64-windows
+      CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
   - os: linux-ppc64le
     compiler: gcc
     env:
diff --git a/scripts/run_integration.sh b/scripts/run_integration.sh
index 322cf4c..8cd7fd8 100755
--- a/scripts/run_integration.sh
+++ b/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}

From bd37e1bf240d19562dfeb91bcf40941ca401eec7 Mon Sep 17 00:00:00 2001
From: Guillaume Chatelet <gchatelet@google.com>
Date: Thu, 17 Jan 2019 14:12:04 +0100
Subject: [PATCH 02/12] Remove unavailable MSVC version and test Ninja on
 travis

---
 .travis.yml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 79e11f0..3aab8f5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,6 +13,7 @@ matrix:
     env:
       TOOLCHAIN=NATIVE
       TARGET=x86_64-linux-gnu
+      CMAKE_GENERATOR=Ninja
   - os: linux
     compiler: clang
     env:
@@ -28,11 +29,6 @@ matrix:
     env:
       TOOLCHAIN=NATIVE
       TARGET=x86_64-osx
-  - os: windows
-    env:
-      TOOLCHAIN=NATIVE
-      TARGET=x86_64-windows
-      CMAKE_GENERATOR="Visual Studio 14 2015 Win64"
   - os: windows
     env:
       TOOLCHAIN=NATIVE

From 5f5cde57976e9b36c6937c99ee8c4dcb37348519 Mon Sep 17 00:00:00 2001
From: Guillaume Chatelet <gchatelet@google.com>
Date: Thu, 17 Jan 2019 14:19:34 +0100
Subject: [PATCH 03/12] Add ninja build.

---
 .travis.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 3aab8f5..a7544a1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,11 @@ cache:
   directories:
     - $HOME/cpu_features_archives
 
+addons:
+  apt:
+    packages:
+    - ninja-build
+
 matrix:
   include:
   - os: linux

From 674c5878cacb7606d976543b6e75c25b404b287d Mon Sep 17 00:00:00 2001
From: Guillaume Chatelet <gchatelet@google.com>
Date: Thu, 17 Jan 2019 14:24:14 +0100
Subject: [PATCH 04/12] Use Ninja by default

---
 .travis.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index a7544a1..993a0d0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,6 +11,9 @@ addons:
     packages:
     - ninja-build
 
+env:
+  CMAKE_GENERATOR=Ninja
+
 matrix:
   include:
   - os: linux
@@ -18,7 +21,6 @@ matrix:
     env:
       TOOLCHAIN=NATIVE
       TARGET=x86_64-linux-gnu
-      CMAKE_GENERATOR=Ninja
   - os: linux
     compiler: clang
     env:

From 081188a17dfe48ed8682c39e674f84995b999aa1 Mon Sep 17 00:00:00 2001
From: Guillaume Chatelet <gchatelet@google.com>
Date: Thu, 17 Jan 2019 14:24:42 +0100
Subject: [PATCH 05/12] Show tests output

---
 scripts/run_integration.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/run_integration.sh b/scripts/run_integration.sh
index 8cd7fd8..aa7a3f6 100755
--- a/scripts/run_integration.sh
+++ b/scripts/run_integration.sh
@@ -105,7 +105,7 @@ function integrate() {
     done
     ${QEMU} ${DEMO}
   else
-    cmake --build "${BUILD_DIR}" ${CMAKE_TEST_ARGS}
+    CTEST_OUTPUT_ON_FAILURE=1 cmake --build "${BUILD_DIR}" ${CMAKE_TEST_ARGS}
     ${DEMO}
   fi
 }

From 24dddd1d21c26b2d7c56ae49c6eb71f28e3ddbc7 Mon Sep 17 00:00:00 2001
From: Guillaume Chatelet <gchatelet@google.com>
Date: Thu, 17 Jan 2019 14:27:22 +0100
Subject: [PATCH 06/12] Defaulting env to Ninja in the build matrix

---
 .travis.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 993a0d0..7dbfbc5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,10 +11,9 @@ addons:
     packages:
     - ninja-build
 
-env:
-  CMAKE_GENERATOR=Ninja
-
 matrix:
+  env:
+    CMAKE_GENERATOR=Ninja
   include:
   - os: linux
     compiler: gcc

From 8685431ded22ed0e841d022bfc8364c1a555c7e0 Mon Sep 17 00:00:00 2001
From: Guillaume Chatelet <gchatelet@google.com>
Date: Thu, 17 Jan 2019 14:33:28 +0100
Subject: [PATCH 07/12] Defaulting env to Ninja in the build matrix

---
 .travis.yml | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7dbfbc5..4334a9e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,44 +11,40 @@ addons:
     packages:
     - ninja-build
 
-matrix:
-  env:
+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
   - os: osx
     compiler: clang
     env:
-      TOOLCHAIN=NATIVE
       TARGET=x86_64-osx
   - 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

From 3130eef35d78609e82e947aeacbf77d43d5ba5a5 Mon Sep 17 00:00:00 2001
From: Guillaume Chatelet <gchatelet@google.com>
Date: Thu, 17 Jan 2019 14:45:44 +0100
Subject: [PATCH 08/12] Do not use ninja on OSX

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 4334a9e..6f6e725 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,10 +30,12 @@ matrix:
     compiler: gcc
     env:
       TARGET=x86_64-osx
+      CMAKE_GENERATOR="Unix Makefiles"
   - os: osx
     compiler: clang
     env:
       TARGET=x86_64-osx
+      CMAKE_GENERATOR="Unix Makefiles"
   - os: windows
     env:
       TARGET=x86_64-windows

From d724ac04fc27e44aa10d68ea981905ed10ea4209 Mon Sep 17 00:00:00 2001
From: Guillaume Chatelet <gchatelet@google.com>
Date: Thu, 17 Jan 2019 14:52:13 +0100
Subject: [PATCH 09/12] Fix test output.

---
 scripts/run_integration.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/run_integration.sh b/scripts/run_integration.sh
index aa7a3f6..5df92ea 100755
--- a/scripts/run_integration.sh
+++ b/scripts/run_integration.sh
@@ -105,7 +105,8 @@ function integrate() {
     done
     ${QEMU} ${DEMO}
   else
-    CTEST_OUTPUT_ON_FAILURE=1 cmake --build "${BUILD_DIR}" ${CMAKE_TEST_ARGS}
+    export CTEST_OUTPUT_ON_FAILURE=1
+    cmake --build "${BUILD_DIR}" ${CMAKE_TEST_ARGS}
     ${DEMO}
   fi
 }

From 1ee19cd68369f7287bce24b1349f23a0e648b641 Mon Sep 17 00:00:00 2001
From: Guillaume Chatelet <gchatelet@google.com>
Date: Thu, 17 Jan 2019 15:04:14 +0100
Subject: [PATCH 10/12] Fix running tests

---
 scripts/run_integration.sh | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/scripts/run_integration.sh b/scripts/run_integration.sh
index 5df92ea..dfead08 100755
--- a/scripts/run_integration.sh
+++ b/scripts/run_integration.sh
@@ -97,18 +97,16 @@ 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
-    export CTEST_OUTPUT_ON_FAILURE=1
-    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
+  wait -n
+  ${RUN} ${DEMO}
 }
 
 function expand_linaro_config() {

From 29148fffac7f1d25e892a2a476f6a706f6707d54 Mon Sep 17 00:00:00 2001
From: Guillaume Chatelet <gchatelet@google.com>
Date: Thu, 17 Jan 2019 15:07:52 +0100
Subject: [PATCH 11/12] Fix running tests

---
 scripts/run_integration.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/scripts/run_integration.sh b/scripts/run_integration.sh
index dfead08..f7ac962 100755
--- a/scripts/run_integration.sh
+++ b/scripts/run_integration.sh
@@ -105,7 +105,6 @@ function integrate() {
   for test_binary in ${BUILD_DIR}/test/*_test; do
     ${RUN_CMD} ${test_binary} &
   done
-  wait -n
   ${RUN} ${DEMO}
 }
 

From 718647ac24cd5edd2be3d6660a9bdb676d8601fa Mon Sep 17 00:00:00 2001
From: Guillaume Chatelet <gchatelet@google.com>
Date: Thu, 17 Jan 2019 15:12:01 +0100
Subject: [PATCH 12/12] Fix typo

---
 scripts/run_integration.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/run_integration.sh b/scripts/run_integration.sh
index f7ac962..2f46bb1 100755
--- a/scripts/run_integration.sh
+++ b/scripts/run_integration.sh
@@ -105,7 +105,7 @@ function integrate() {
   for test_binary in ${BUILD_DIR}/test/*_test; do
     ${RUN_CMD} ${test_binary} &
   done
-  ${RUN} ${DEMO}
+  ${RUN_CMD} ${DEMO}
 }
 
 function expand_linaro_config() {