Commit 9b29d049 authored by Daniel P. Berrangé's avatar Daniel P. Berrangé Committed by Alex Bennée
Browse files

travis: stop redefining the script commands 



One of the matrix entries redefines the script command in order to add
the ${MAKEFLAGS} variable. Ideally ${MAKEFLAGS} would be referenced by
the definition of the ${TEST_CMD} env variable, but this isn't possible
in travis. ${MAKEFLAGS} exists to eliminate duplication of flags in
every "make" command, but this cure causes a worse problem, namely the
reduplication of the "script" command. It is simpler to just insert "-j3"
directly into any "make" command.

Signed-off-by: default avatarDaniel P. Berrangé <berrange@redhat.com>
Signed-off-by: default avatarAlex Bennée <alex.bennee@linaro.org>
parent 91fa7dd1

.travis.yml

+3 −6
Original line number Diff line number Diff line
@@ -65,8 +65,7 @@ env: 
  global:

    - SRC_DIR="."

    - BUILD_DIR="."

    - TEST_CMD="make check"

    - MAKEFLAGS="-j3"

    - TEST_CMD="make check -j3"





git:
@@ -78,7 +77,7 @@ before_script: 
  - mkdir -p ${BUILD_DIR} && cd ${BUILD_DIR}

  - ${SRC_DIR}/configure ${CONFIG} || { cat config.log && exit 1; }

script:

  - make ${MAKEFLAGS} && ${TEST_CMD}

  - make -j3 && ${TEST_CMD}





matrix:
@@ -255,9 +254,7 @@ matrix: 


    - env:

        - CONFIG="--disable-system --disable-docs"

        - TEST_CMD="make check-tcg"

      script:

        - make ${MAKEFLAGS} && ${TEST_CMD} ${MAKEFLAGS}

        - TEST_CMD="make -j3 check-tcg"

      sudo: required

      dist: trusty

      compiler: gcc