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 1d65e4ddd4606192f2d896dfaeb5ad51d6943b0d..d3bb6592b1e2dc5f045488ce58a2c52f83a5aa6d 100644 (file)
--- 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"