Merge pull request #50 from google/try_travisci_windows_build

Try travisci windows build

.travis.yml

@@ -12,32 +12,36 @@ matrix:
     compiler: gcc
     env:
       TOOLCHAIN=NATIVE
-      TARGET=native
+      TARGET=x86_64-linux-gnu
   - os: linux
     compiler: clang
     env:
       TOOLCHAIN=NATIVE
-      TARGET=native
+      TARGET=x86_64-linux-gnu
   - os: osx
     compiler: gcc
     env:
       TOOLCHAIN=NATIVE
-      TARGET=native
+      TARGET=x86_64-osx
   - os: osx
     compiler: clang
     env:
       TOOLCHAIN=NATIVE
-      TARGET=native
+      TARGET=x86_64-osx
+  - os: windows
+    env:
+      TOOLCHAIN=NATIVE
+      TARGET=x86_64-windows
   - os: linux-ppc64le
     compiler: gcc
     env:
       TOOLCHAIN=NATIVE
-      TARGET=native
+      TARGET=ppc64le-linux-gnu
   - os: linux-ppc64le
     compiler: clang
     env:
       TOOLCHAIN=NATIVE
-      TARGET=native
+      TARGET=ppc64le-linux-gnu
   # Toolchains for little-endian, 64-bit ARMv8 for GNU/Linux systems
   - os: linux
     env:

scripts/run_integration.sh

@@ -75,24 +75,39 @@ function assert_defined(){
 }
 
 function integrate() {
-  cd "${PROJECT_FOLDER}" || exit
+  cd "${PROJECT_FOLDER}"
-  cmake -H. -B"${BUILD_DIR}" ${DEFAULT_CMAKE_ARGS} ${CMAKE_ADDITIONAL_ARGS}
+  case "${OS}" in
-  cmake --build "${BUILD_DIR}" --target all
+   "Windows_NT") CMAKE_BUILD_ARGS="--config Debug --target ALL_BUILD"
+                 CMAKE_TEST_ARGS="--config Debug --target RUN_TESTS"
+                 DEMO=${BUILD_DIR}/Debug/list_cpu_features.exe
+                 ;;
+   *)            CMAKE_BUILD_ARGS="--target all"
+                 CMAKE_TEST_ARGS="--target test"
+                 DEMO=${BUILD_DIR}/list_cpu_features
+                 ;;
+  esac
 
-  if [[ -n "${QEMU_ARCH}" ]]; then
+  # Generating CMake configuration
-    if [[ "${QEMU_ARCH}" == "DISABLED" ]]; then
+  cmake -H. -B"${BUILD_DIR}" ${DEFAULT_CMAKE_ARGS} ${CMAKE_ADDITIONAL_ARGS}
-      QEMU="true || "
+
-    else
+  # Building
-      installqemuifneeded
+  cmake --build "${BUILD_DIR}" ${CMAKE_BUILD_ARGS}
-      QEMU="${QEMU_INSTALL}/bin/qemu-${QEMU_ARCH} ${QEMU_ARGS}"
+
-    fi
+  # Running tests if needed
-  else
+  if [[ "${QEMU_ARCH}" == "DISABLED" ]]; then
-    QEMU=""
+    return
+  fi
+  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}
   fi
-  # Run tests
-  for test_binary in ${BUILD_DIR}/test/*_test; do ${QEMU} ${test_binary}; done
-  # Run demo program
-  ${QEMU} "${BUILD_DIR}/list_cpu_features"
 }
 
 function expand_linaro_config() {

scripts/test_integration.sh

@@ -76,6 +76,9 @@ ENVIRONMENTS="
   set_mips
 "
 
+set -v
+set -e
+
 for SET_ENVIRONMENT in ${ENVIRONMENTS}; do
   ${SET_ENVIRONMENT}
   expand_environment_and_integrate