From c939eccf4a344a7389c1e21adec2a22df721e6a2 Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Tue, 10 Sep 2019 08:02:55 +0000 Subject: Add 32-bit (Windows-x86) builds to travis, both with MSVC and GCC --- .travis.yml | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 53 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2a04faf..a360c2a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -246,6 +246,34 @@ matrix: script: - cmd.exe /C 'vcvarsall.bat x64 && nmake OPTS=symbols,msvcrt,threads -f makefile.vc all tcltest' - cmd.exe /C 'vcvarsall.bat x64 && nmake OPTS=symbols,msvcrt,threads -f makefile.vc test' +# Test on Windows with MSVC native (32-bit) + - name: "Windows/MSVC-x86/Shared" + os: windows + compiler: cl + env: *vcenv + before_install: *vcpreinst + install: [] + script: + - cmd.exe /C 'vcvarsall.bat x86 && nmake OPTS=threads -f makefile.vc all tcltest' + - cmd.exe /C 'vcvarsall.bat x86 && nmake OPTS=threads -f makefile.vc test' + - name: "Windows/MSVC-x86/Static" + os: windows + compiler: cl + env: *vcenv + before_install: *vcpreinst + install: [] + script: + - cmd.exe /C 'vcvarsall.bat x86 && nmake OPTS=static,msvcrt,threads -f makefile.vc all tcltest' + - cmd.exe /C 'vcvarsall.bat x86 && nmake OPTS=static,msvcrt,threads -f makefile.vc test' + - name: "Windows/MSVC-x86/Debug" + os: windows + compiler: cl + env: *vcenv + before_install: *vcpreinst + install: [] + script: + - cmd.exe /C 'vcvarsall.bat x86 && nmake OPTS=symbols,msvcrt,threads -f makefile.vc all tcltest' + - cmd.exe /C 'vcvarsall.bat x86 && nmake OPTS=symbols,msvcrt,threads -f makefile.vc test' # Test on Windows with GCC native - name: "Windows/GCC/Shared" os: windows @@ -253,7 +281,7 @@ matrix: env: - BUILD_DIR=win - CFGOPT="--enable-64bit --enable-threads" - before_install: + before_install: &makepreinst - choco install make - cd ${BUILD_DIR} - name: "Windows/GCC/Static" @@ -262,18 +290,36 @@ matrix: env: - BUILD_DIR=win - CFGOPT="--enable-64bit --enable-threads --disable-shared" - before_install: - - choco install make - - cd ${BUILD_DIR} + before_install: *makepreinst - name: "Windows/GCC/Debug" os: windows compiler: gcc env: - BUILD_DIR=win - CFGOPT="--enable-64bit --enable-threads --enable-symbols" - before_install: - - choco install make - - cd ${BUILD_DIR} + before_install: *makepreinst +# Test on Windows with GCC native (32-bit) + - name: "Windows/GCC-x86/Shared" + os: windows + compiler: gcc + env: + - BUILD_DIR=win + - CFGOPT="--enable-threads" + before_install: *makepreinst + - name: "Windows/GCC-x86/Static" + os: windows + compiler: gcc + env: + - BUILD_DIR=win + - CFGOPT="--enable-threads --disable-shared" + before_install: *makepreinst + - name: "Windows/GCC-x86/Debug" + os: windows + compiler: gcc + env: + - BUILD_DIR=win + - CFGOPT="--enable-threads --enable-symbols" + before_install: *makepreinst before_install: - cd ${BUILD_DIR} install: -- cgit v0.12 From 3d2df2eae1e70c6f665c91b11d5caedc357f9cc1 Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Tue, 10 Sep 2019 11:59:29 +0000 Subject: Run all test-cases with -verbose sbtel, so we can see which test-case actually hangs. --- .travis.yml | 35 +++++++++++++++-------------------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/.travis.yml b/.travis.yml index a360c2a..a52005f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,18 +15,15 @@ matrix: dist: xenial compiler: gcc env: - - CFGOPT=--disable-shared + - CFGOPT="--disable-shared" - BUILD_DIR=unix -# Debug build. Running test-cases disabled, because it is currently failing. - - name: "Linux/GCC/Debug/no test" + - name: "Linux/GCC/Debug" os: linux dist: xenial compiler: gcc env: - BUILD_DIR=unix - - CFGOPT=--enable-symbols=all - script: - - make all tcltest + - CFGOPT="--enable-symbols" # Older versions of GCC... - name: "Linux/GCC 7/Shared" os: linux @@ -88,24 +85,22 @@ matrix: dist: xenial compiler: clang env: - - CFGOPT=--disable-shared + - CFGOPT="--disable-shared" - BUILD_DIR=unix -# Debug build. Running test-cases disabled, because it is currently failing. - - name: "Linux/Clang/Debug/no test" + - name: "Linux/Clang/Debug" os: linux dist: xenial compiler: clang env: - BUILD_DIR=unix - - CFGOPT=--enable-symbols=all - script: - - make all tcltest + - CFGOPT="--enable-symbols" # Testing on Mac, various styles - name: "macOS/Xcode 11/Shared/Unix-like" os: osx osx_image: xcode11 env: - BUILD_DIR=unix + - CFGOPT="--enable-threads" - name: "macOS/Xcode 11/Shared" os: osx osx_image: xcode11 @@ -115,7 +110,7 @@ matrix: script: &mactest - make all # The styles=develop avoids some weird problems on OSX - - make test styles=develop + - make test styles=develop TESTFLAGS="-verbose sbtel" - name: "macOS/Xcode 10/Shared" os: osx osx_image: xcode10.2 @@ -227,7 +222,7 @@ matrix: install: [] script: - cmd.exe /C 'vcvarsall.bat x64 && nmake OPTS=threads -f makefile.vc all tcltest' - - cmd.exe /C 'vcvarsall.bat x64 && nmake OPTS=threads -f makefile.vc test' + - cmd.exe /C 'vcvarsall.bat x64 && nmake OPTS=threads -f makefile.vc test TESTFLAGS="-verbose sbtel"' - name: "Windows/MSVC/Static" os: windows compiler: cl @@ -236,7 +231,7 @@ matrix: install: [] script: - cmd.exe /C 'vcvarsall.bat x64 && nmake OPTS=static,msvcrt,threads -f makefile.vc all tcltest' - - cmd.exe /C 'vcvarsall.bat x64 && nmake OPTS=static,msvcrt,threads -f makefile.vc test' + - cmd.exe /C 'vcvarsall.bat x64 && nmake OPTS=static,msvcrt,threads -f makefile.vc test TESTFLAGS="-verbose sbtel"' - name: "Windows/MSVC/Debug" os: windows compiler: cl @@ -245,7 +240,7 @@ matrix: install: [] script: - cmd.exe /C 'vcvarsall.bat x64 && nmake OPTS=symbols,msvcrt,threads -f makefile.vc all tcltest' - - cmd.exe /C 'vcvarsall.bat x64 && nmake OPTS=symbols,msvcrt,threads -f makefile.vc test' + - cmd.exe /C 'vcvarsall.bat x64 && nmake OPTS=symbols,msvcrt,threads -f makefile.vc test TESTFLAGS="-verbose sbtel"' # Test on Windows with MSVC native (32-bit) - name: "Windows/MSVC-x86/Shared" os: windows @@ -255,7 +250,7 @@ matrix: install: [] script: - cmd.exe /C 'vcvarsall.bat x86 && nmake OPTS=threads -f makefile.vc all tcltest' - - cmd.exe /C 'vcvarsall.bat x86 && nmake OPTS=threads -f makefile.vc test' + - cmd.exe /C 'vcvarsall.bat x86 && nmake OPTS=threads -f makefile.vc test TESTFLAGS="-verbose sbtel"' - name: "Windows/MSVC-x86/Static" os: windows compiler: cl @@ -264,7 +259,7 @@ matrix: install: [] script: - cmd.exe /C 'vcvarsall.bat x86 && nmake OPTS=static,msvcrt,threads -f makefile.vc all tcltest' - - cmd.exe /C 'vcvarsall.bat x86 && nmake OPTS=static,msvcrt,threads -f makefile.vc test' + - cmd.exe /C 'vcvarsall.bat x86 && nmake OPTS=static,msvcrt,threads -f makefile.vc test TESTFLAGS="-verbose sbtel"' - name: "Windows/MSVC-x86/Debug" os: windows compiler: cl @@ -273,7 +268,7 @@ matrix: install: [] script: - cmd.exe /C 'vcvarsall.bat x86 && nmake OPTS=symbols,msvcrt,threads -f makefile.vc all tcltest' - - cmd.exe /C 'vcvarsall.bat x86 && nmake OPTS=symbols,msvcrt,threads -f makefile.vc test' + - cmd.exe /C 'vcvarsall.bat x86 && nmake OPTS=symbols,msvcrt,threads -f makefile.vc test TESTFLAGS="-verbose sbtel"' # Test on Windows with GCC native - name: "Windows/GCC/Shared" os: windows @@ -328,4 +323,4 @@ before_script: - export ERROR_ON_FAILURES=1 script: - make all tcltest - - make test + - make test TESTFLAGS="-verbose sbtel" -- cgit v0.12 From e10b32c27a1f48c45ea90e6af530c75fa3fff7a2 Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Sun, 15 Sep 2019 00:01:34 +0000 Subject: try xcode 10.3 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a52005f..8defb6e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -113,7 +113,7 @@ matrix: - make test styles=develop TESTFLAGS="-verbose sbtel" - name: "macOS/Xcode 10/Shared" os: osx - osx_image: xcode10.2 + osx_image: xcode10.3 env: - BUILD_DIR=macosx install: [] -- cgit v0.12