Add a new file to gitignore

[fio.git] / ci / travis-install.sh

diff --git a/ci/travis-install.sh b/ci/travis-install.sh
index 096347ec662acee0d8ade970e0804b09a55424d5..103695dc6d6391f132d90681a6be4e8009b76f87 100755 (executable)
--- a/ci/travis-install.sh
+++ b/ci/travis-install.sh
@@ -1,12 +1,15 @@
 #!/bin/bash
+set -eu
 
+CI_TARGET_ARCH="${BUILD_ARCH:-$TRAVIS_CPU_ARCH}"
 case "$TRAVIS_OS_NAME" in
     "linux")
+       # Architecture-dependent packages.
        pkgs=(
            libaio-dev
-           libcunit1
            libcunit1-dev
-           libgoogle-perftools4
+           libfl-dev
+           libgoogle-perftools-dev
            libibverbs-dev
            libiscsi-dev
            libnuma-dev
@@ -14,18 +17,39 @@ case "$TRAVIS_OS_NAME" in
            librdmacm-dev
            libz-dev
        )
-       if [[ "$BUILD_ARCH" == "x86" ]]; then
-           pkgs=("${pkgs[@]/%/:i386}")
-           pkgs+=(gcc-multilib python3-scipy)
-       else
-           pkgs+=(glusterfs-common python3-scipy)
+       case "$CI_TARGET_ARCH" in
+           "x86")
+               pkgs=("${pkgs[@]/%/:i386}")
+               pkgs+=(
+                   gcc-multilib
+                   pkg-config:i386
+               )
+               ;;
+           "amd64")
+               pkgs+=(nvidia-cuda-dev)
+               ;;
+       esac
+       if [[ $CI_TARGET_ARCH != "x86" ]]; then
+               pkgs+=(glusterfs-common)
        fi
+       # Architecture-independent packages and packages for which we don't
+       # care about the architecture.
+       pkgs+=(
+           bison
+           flex
+           python3
+           python3-scipy
+           python3-six
+       )
        sudo apt-get -qq update
        sudo apt-get install --no-install-recommends -qq -y "${pkgs[@]}"
        ;;
     "osx")
-       brew update
+       brew update >/dev/null 2>&1
        brew install cunit
-       pip3 install scipy
+       pip3 install scipy six
        ;;
 esac
+
+echo "Python3 path: $(type -p python3 2>&1)"
+echo "Python3 version: $(python3 -V 2>&1)"