From: Ivan Maidanski <ivmai@mail.ru>
Date: Mon, 28 Nov 2016 06:46:28 +0000 (+0300)
Subject: Travis CI configuration: also build and test C++
X-Git-Tag: v7.4.6~162
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bc27d8a00f482f89a89b7f136a28395f462f6fdc;p=gc

Travis CI configuration: also build and test C++
(Cherry-pick part of commits f2b0f7f, 6c48bae, 7807132 from 'master'.)

Note: libgccpp and test_cpp are disabled for Linux/x86 builds currently.
---

diff --git a/.travis.yml b/.travis.yml
index 1d65e4dd..d3bb6592 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,4 @@
-language: c
+language: c++
 
 os:
   - linux
@@ -22,6 +22,8 @@ sudo: required
 before_install:
   - if [[ "$TRAVIS_OS_NAME" == "linux" && "$CFLAGS_EXTRA_M" == "-m32" ]]; then
       sudo apt-get install gcc-multilib;
+    else
+      CONF_CPP=--enable-cplusplus;
     fi
 
 install:
@@ -29,5 +31,5 @@ install:
   - ./autogen.sh
 
 script:
-  - ./configure --enable-munmap
+  - ./configure $CONF_CPP --enable-munmap
   - make -j check CFLAGS_EXTRA="$CFLAGS_EXTRA_M"