travis: clean up
authorEric Engestrom <eric.engestrom@intel.com>
Fri, 8 Mar 2019 15:33:39 +0000 (15:33 +0000)
committerEric Engestrom <eric.engestrom@intel.com>
Fri, 8 Mar 2019 15:33:39 +0000 (15:33 +0000)
Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
.travis.yml

index e13f384a2a3c2b9ebe1e54a721446cfd5bcfd5f0..382c2efcf76bdd1a2aad1228d742c5bfdef0d837 100644 (file)
@@ -14,8 +14,6 @@ matrix:
     - env:
         - LABEL="macOS make"
         - BUILD=make
-        - MAKEFLAGS="-j4"
-        - MAKE_CHECK_COMMAND="make check"
         - DRI_LOADERS="--with-platforms=x11 --disable-egl"
       os: osx
     - env:
@@ -66,6 +64,7 @@ install:
 script:
   - if test "x$BUILD" = xmake; then
       export CFLAGS="$CFLAGS -isystem`pwd`";
+      export MAKEFLAGS="-j4";
 
       mkdir build &&
       cd build &&
@@ -78,7 +77,7 @@ script:
         --with-vulkan-drivers=$VULKAN_DRIVERS
         --disable-llvm-shared-libs
         &&
-      make && eval $MAKE_CHECK_COMMAND;
+      make && make check;
     fi
 
   - |