[v4,5/6] travis: enable cpp test during cross-compilation

Message ID 1505318407-21381-6-git-send-email-odpbot@yandex.ru
State Superseded
Headers show
Series
  • [v4,1/6] travis: fix powerpc test name
Related show

Commit Message

Github ODP bot Sept. 13, 2017, 4 p.m.
From: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov@linaro.org>


Install proper packages to enable cross-testing of linking C++ apps with
ODP.

Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov@linaro.org>

---
/** Email created from pull request 175 (lumag:build-x86)
 ** https://github.com/Linaro/odp/pull/175
 ** Patch: https://github.com/Linaro/odp/pull/175.patch
 ** Base sha: fb3f36cec108ce9c55241d9f0e66d4832a552b8a
 ** Merge commit sha: 053d08aa14dd4077b17b983bac6b9930801fbcba
 **/
 .travis.yml | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

Patch

diff --git a/.travis.yml b/.travis.yml
index 3854378d..06983f8e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -85,13 +85,20 @@  before_install:
                   sudo -E apt-get -y --no-install-suggests --no-install-recommends --force-yes install build-essential ;
                   if [ "$CROSS_ARCH" = "i386" ] ;
                   then
-                        sudo -E apt-get -y --no-install-suggests --no-install-recommends --force-yes install gcc-multilib ;
+                        sudo -E apt-get -y --no-install-suggests --no-install-recommends --force-yes install g++-multilib ;
                   else
-                        sudo -E apt-get -y --no-install-suggests --no-install-recommends --force-yes install gcc-"$CROSS_GNU_TYPE" ;
+                        sudo -E apt-get -y --no-install-suggests --no-install-recommends --force-yes install g++-"$CROSS_GNU_TYPE" ;
                   fi ;
-                  sudo -E apt-get -y --no-install-suggests --no-install-recommends --force-yes install libc6-dev:"$CROSS_ARCH" libssl-dev:"$CROSS_ARCH" zlib1g-dev:"$CROSS_ARCH" libconfig-dev:"$CROSS_ARCH" ;
+                  sudo -E apt-get -y --no-install-suggests --no-install-recommends --force-yes install libc6-dev:"$CROSS_ARCH" libssl-dev:"$CROSS_ARCH" zlib1g-dev:"$CROSS_ARCH" libconfig-dev:"$CROSS_ARCH" libstdc++-4.8-dev:"$CROSS_ARCH";
                   export PKG_CONFIG_PATH=/usr/lib/${CROSS_MULTIARCH}/pkgconfig:/usr/${CROSS_MULTIARCH}/lib/pkgconfig ;
           fi
+        - if [ "${CC#clang}" != "${CC}" ] ;
+          then
+                export CXX="${CC/clang/clang++}";
+          elif [ "$CROSS_ARCH" = "i386" ] ;
+          then
+                export CXX="g++ -m32" ;
+          fi
         - if test ! -L /usr/lib/ccache/${CC%% *} ; then sudo ln -s -t /usr/lib/ccache/ `which ${CC%% *}` ; fi
         - ccache -s
         # Install cunit for the validation tests because distro version is too old and fails C99 compile
@@ -187,7 +194,6 @@  jobs:
                           - ./bootstrap
                           - ./configure --prefix=$HOME/odp-install $CROSS
                             --enable-debug=full
-                            --disable-test-cpp
                             --enable-helper-linux
                           - make -j $(nproc)
                 - stage: test
@@ -198,7 +204,6 @@  jobs:
                           - ./bootstrap
                           - ./configure --prefix=$HOME/odp/odp-install $CROSS
                             --enable-debug=full
-                            --disable-test-cpp
                             --enable-helper-linux
                           - make -j $(nproc)
                 - stage: test
@@ -209,7 +214,6 @@  jobs:
                           - ./bootstrap
                           - ./configure --prefix=$HOME/odp-install $CROSS
                             --enable-debug=full
-                            --disable-test-cpp
                             --enable-helper-linux
                           - make -j $(nproc)
                 - stage: test
@@ -220,7 +224,6 @@  jobs:
                           - ./bootstrap
                           - ./configure --prefix=$HOME/odp-install $CROSS
                             --enable-debug=full
-                            --disable-test-cpp
                             --enable-helper-linux
                           - make -j $(nproc)
                 - stage: test
@@ -231,7 +234,6 @@  jobs:
                           - ./bootstrap
                           - ./configure --prefix=$HOME/odp-install $CROSS
                             --enable-debug=full
-                            --disable-test-cpp
                             --enable-helper-linux
                           - make -j $(nproc)
                 - stage: test
@@ -242,7 +244,6 @@  jobs:
                           - ./bootstrap
                           - ./configure --prefix=$HOME/odp-install $CROSS
                             --enable-debug=full
-                            --disable-test-cpp
                             --enable-helper-linux
                           - make -j $(nproc)
                 - stage: test
@@ -253,7 +254,6 @@  jobs:
                           - ./bootstrap
                           - ./configure --prefix=$HOME/odp-install $CROSS
                             --enable-debug=full
-                            --disable-test-cpp
                             --enable-helper-linux
                           - make -j $(nproc)
                 - stage: test
@@ -264,7 +264,6 @@  jobs:
                           - ./bootstrap
                           - ./configure --prefix=$HOME/odp-install $CROSS
                             --enable-debug=full
-                            --disable-test-cpp
                             --enable-helper-linux
                           - make -j $(nproc)
                 - stage: test