More tinkering with the build. Can override scripts in the matrix, but need magic to find nmake.

1 files changed, 75 insertions, 30 deletions

diff --git a/.travis.yml b/.travis.yml
index 5b19812..c5081ce 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,29 +3,34 @@ language: c
 
 matrix:
   include:
-    - os: linux
+    - name: "Linux/Clang/Shared"
+      os: linux
       dist: xenial
       compiler: clang
       env:
         - BUILD_DIR=unix
-    - os: linux
+    - name: "Linux/Clang/Static"
+      os: linux
       dist: xenial
       compiler: clang
       env:
         - CFGOPT=--disable-shared
         - BUILD_DIR=unix
-    - os: linux
+    - name: "Linux/GCC/Shared"
+      os: linux
       dist: xenial
       compiler: gcc
       env:
         - BUILD_DIR=unix
-    - os: linux
+    - name: "Linux/GCC/Static"
+      os: linux
       dist: xenial
       compiler: gcc
       env:
         - CFGOPT=--disable-shared
         - BUILD_DIR=unix
-    - os: linux
+    - name: "Linux/GCC 4.9/Shared"
+      os: linux
       dist: xenial
       compiler: gcc-4.9
       addons:
@@ -36,7 +41,8 @@ matrix:
             - g++-4.9
       env:
         - BUILD_DIR=unix
-    - os: linux
+    - name: "Linux/GCC 5/Shared"
+      os: linux
       dist: xenial
       compiler: gcc-5
       addons:
@@ -47,7 +53,8 @@ matrix:
             - g++-5
       env:
         - BUILD_DIR=unix
-    - os: linux
+    - name: "Linux/GCC 6/Shared"
+      os: linux
       dist: xenial
       compiler: gcc-6
       addons:
@@ -58,7 +65,8 @@ matrix:
             - g++-6
       env:
         - BUILD_DIR=unix
-    - os: linux
+    - name: "Linux/GCC 7/Shared"
+      os: linux
       dist: xenial
       compiler: gcc-7
       addons:
@@ -69,32 +77,52 @@ matrix:
             - g++-7
       env:
         - BUILD_DIR=unix
-    - os: osx
+    - name: "macOS/Xcode 8/Shared/Unix-like"
+      os: osx
       osx_image: xcode8
       env:
         - BUILD_DIR=unix
-    - os: osx
+    - name: "macOS/Xcode 8/Shared/Mac-like"
+      os: osx
       osx_image: xcode8
       env:
         - BUILD_DIR=macosx
-        - NO_DIRECT_CONFIGURE=1
-    - os: osx
+      install:
+        - echo skipping configure
+      script:
+        - make all
+        # The styles=develop avoids some weird problems on OSX
+        - make test styles=develop
+    - name: "macOS/Xcode 9/Shared/Mac-like"
+      os: osx
       osx_image: xcode9
       env:
         - BUILD_DIR=macosx
-        - NO_DIRECT_CONFIGURE=1
-    - os: osx
+      install:
+        - echo skipping configure
+      script:
+        - make all
+        # The styles=develop avoids some weird problems on OSX
+        - make test styles=develop
+    - name: "macOS/Xcode 10/Shared/Mac-like"
+      os: osx
       osx_image: xcode10.2
       env:
         - BUILD_DIR=macosx
-        - NO_DIRECT_CONFIGURE=1
+      install:
+        - echo skipping configure
+      script:
+        - make all
+        # The styles=develop avoids some weird problems on OSX
+        - make test styles=develop
 ### C builds not currently directly supported on Windows instances
 #    - os: windows
 #      env:
 #        - BUILD_DIR=win
 ### ... so proxy with a Mingw cross-compile
 # Test with mingw-w64 (32 bit)
-    - os: linux
+    - name: "Linux-cross-Windows-32/GCC/Shared/no test"
+      os: linux
       dist: xenial
       compiler: i686-w64-mingw32-gcc
       addons:
@@ -109,8 +137,11 @@ matrix:
       env:
         - BUILD_DIR=win
         - CFGOPT="--host=i686-w64-mingw32 --enable-threads"
-        - NO_DIRECT_TEST=1
-    - os: linux
+      script:
+        - make all tcltest
+        - echo "SKIPPED TEST: CROSS COMPILING"
+    - name: "Linux-cross-Windows-32/GCC/Static/no test"
+      os: linux
       dist: xenial
       compiler: i686-w64-mingw32-gcc
       addons:
@@ -125,9 +156,12 @@ matrix:
       env:
         - BUILD_DIR=win
         - CFGOPT="--host=i686-w64-mingw32 --disable-shared --enable-threads"
-        - NO_DIRECT_TEST=1
+      script:
+        - make all tcltest
+        - echo "SKIPPED TEST: CROSS COMPILING"
 # Test with mingw-w64 (64 bit)
-    - os: linux
+    - name: "Linux-cross-Windows-64/GCC/Shared/no test"
+      os: linux
       dist: xenial
       compiler: x86_64-w64-mingw32-gcc
       addons:
@@ -141,8 +175,11 @@ matrix:
       env:
         - BUILD_DIR=win
         - CFGOPT="--host=x86_64-w64-mingw32 --enable-64bit --enable-threads"
-        - NO_DIRECT_TEST=1
-    - os: linux
+      script:
+        - make all tcltest
+        - echo "SKIPPED TEST: CROSS COMPILING"
+    - name: "Linux-cross-Windows-64/GCC/Static/no test"
+      os: linux
       dist: xenial
       compiler: x86_64-w64-mingw32-gcc
       addons:
@@ -156,19 +193,27 @@ matrix:
       env:
         - BUILD_DIR=win
         - CFGOPT="--host=x86_64-w64-mingw32 --enable-64bit --enable-threads --disable-shared"
-        - NO_DIRECT_TEST=1
-    - os: windows
+      script:
+        - make all tcltest
+        - echo "SKIPPED TEST: CROSS COMPILING"
+    - name: "Windows/MSVC/Shared"
+      os: windows
+      compiler: msvc
       env:
         - BUILD_DIR=win
-        - NO_DIRECT_CONFIGURE=1
-        - MAKE="nmake -f makefile.vc"
+      install:
+        - echo skipping configure
+      script:
+        # This is very ugly!
+        - cmd.exe /C '"C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliary\Build\vcvarsall.bat" x64 && nmake -f makefile.vc all tcltest'
+        - cmd.exe /C '"C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliary\Build\vcvarsall.bat" x64 && nmake -f makefile.vc test'
 
 before_install:
   - export ERROR_ON_FAILURES=1
   - cd ${BUILD_DIR}
 install:
-  - test -n "$NO_DIRECT_CONFIGURE" || ./configure ${CFGOPT}
+  - ./configure ${CFGOPT}
 script:
-  - ${MAKE:-make}
-  # The styles=develop avoids some weird problems on OSX
-  - test -n "$NO_DIRECT_TEST" || ${MAKE:-make} test styles=develop
+  - make all
+  - make tcltest
+  - make test