From: Ivan Maidanski <ivmai@mail.ru>
Date: Tue, 14 Mar 2017 08:57:14 +0000 (+0300)
Subject: Travis CI: Test also build system based on Makefile.direct
X-Git-Tag: v8.0.0~862
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fd3002d6e9032f9f84e0030083b69ce9ebda51c9;p=gc

Travis CI: Test also build system based on Makefile.direct
---

diff --git a/.travis.yml b/.travis.yml
index 8a3d98ab..ee88cbbd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,6 +27,7 @@ env:
   - CSA_CHECK=true CFLAGS_EXTRA_M=-m32
   - CPPCHECK=ALL_EXCEPT_UNUSED
   - CPPCHECK=UNUSED_FUNC
+  - MAKEFILE_NAME=Makefile.direct MAKEFILE_EXTRA_TARGETS="c++-t"
   - SANITIZE=undefined CONF_M_UNMAP=--enable-munmap
 # TODO: Add testing with ASan/MSan when clang-3.8 available.
 
@@ -94,6 +95,9 @@ before_install:
         CPPCHECK_ENABLE="--enable=unusedFunction";
       fi;
     fi
+  - if [[ "$MAKEFILE_NAME" == "" ]]; then
+      MAKEFILE_NAME=Makefile;
+    fi
   - if [[ "$SANITIZE" != "" ]]; then
       CFLAGS_EXTRA="$CFLAGS_EXTRA -fsanitize=$SANITIZE -fno-common -fno-omit-frame-pointer";
     fi
@@ -103,14 +107,16 @@ install:
   - ./autogen.sh
 
 script:
-  - if [[ "$CSA_CHECK" != true && "$CPPCHECK" == "" ]]; then
+  - if [[ "$CSA_CHECK" != true && "$CPPCHECK" == ""
+          && "$MAKEFILE_NAME" != "Makefile.direct" ]]; then
       ./configure $CONF_ASSERTIONS $CONF_CPP $CONF_GCOV $CONF_GC_DEBUG
                 $CONF_LARGE_CONFIG $CONF_M_UNMAP $CONF_SHARED
                 $CONF_SINGLE_OBJ $CONF_STATIC $CONF_THREADS --enable-werror &&
       cat include/config.h;
     fi
   - if [[ "$CSA_CHECK" != true && "$CPPCHECK" == "" ]]; then
-      make -j check CFLAGS_EXTRA="$CFLAGS_EXTRA $CFLAGS_EXTRA_M";
+      make -j -f $MAKEFILE_NAME check $MAKEFILE_EXTRA_TARGETS
+           CFLAGS_EXTRA="$CFLAGS_EXTRA $CFLAGS_EXTRA_M";
     fi
   - if [ -f gctest.log ]; then cat gctest.log; fi
   - if [[ "$CSA_CHECK" == true ]]; then