From c5bbe85f29a60e507f1510d6de30b07be24c9f64 Mon Sep 17 00:00:00 2001 From: dkf Date: Wed, 7 Nov 2018 13:25:45 +0000 Subject: Rebase of travis config --- .travis.yml | 91 +++++++++++++++++++++++++++++ README | 185 ---------------------------------------------------------- tests/all.tcl | 4 +- 3 files changed, 94 insertions(+), 186 deletions(-) diff --git a/.travis.yml b/.travis.yml index 64801ec..7cf6989 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,97 @@ matrix: - os: linux compiler: clang env: + - MATRIX_EVAL="" BUILD_DIR=unix + - os: linux + compiler: clang + env: + - MATRIX_EVAL="" BUILD_DIR=unix CFGOPT=--disable-shared + - os: linux + compiler: gcc + env: + - MATRIX_EVAL="" BUILD_DIR=unix + - os: linux + compiler: gcc + env: + - MATRIX_EVAL="" BUILD_DIR=unix CFGOPT=--disable-shared + - os: linux + compiler: gcc + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-4.9 + env: + - MATRIX_EVAL="CC=gcc-4.9" BUILD_DIR=unix + - os: linux + compiler: gcc + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-5 + env: + - MATRIX_EVAL="CC=gcc-5" BUILD_DIR=unix + - os: linux + compiler: gcc + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-6 + env: + - MATRIX_EVAL="CC=gcc-6" BUILD_DIR=unix + - os: linux + compiler: gcc + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-7 + env: + - MATRIX_EVAL="CC=gcc-7" BUILD_DIR=unix + - os: osx + osx_image: xcode8 + env: + - MATRIX_EVAL="" BUILD_DIR=unix + - os: osx + osx_image: xcode8 + env: + - MATRIX_EVAL="" BUILD_DIR=macosx NO_DIRECT_CONFIGURE=1 + - os: osx + osx_image: xcode9 + env: + - MATRIX_EVAL="" BUILD_DIR=macosx NO_DIRECT_CONFIGURE=1 + - os: osx + osx_image: xcode10 + env: + - MATRIX_EVAL="" BUILD_DIR=macosx NO_DIRECT_CONFIGURE=1 +### C builds not currently supported on Windows instances +# - os: windows +# env: +# - MATRIX_EVAL="" BUILD_DIR=win + +before_install: + - eval "${MATRIX_EVAL}" + - export ERROR_ON_FAILURES=1 + - cd ${BUILD_DIR} +install: + - test -n "$NO_DIRECT_CONFIGURE" || ./configure ${CFGOPT} +script: + - make + - make test +dist: trusty +sudo: false +language: c +matrix: + include: + - os: linux + compiler: clang + env: - MATRIX_EVAL="" - BUILD_DIR=unix - os: linux diff --git a/README b/README index adfdf97..e69de29 100644 --- a/README +++ b/README @@ -1,185 +0,0 @@ -README: Tcl - This is the Tcl 8.6.8 source distribution. - http://sourceforge.net/projects/tcl/files/Tcl/ - You can get any source release of Tcl from the URL above. - -Contents --------- - 1. Introduction - 2. Documentation - 3. Compiling and installing Tcl - 4. Development tools - 5. Tcl newsgroup - 6. The Tcler's Wiki - 7. Mailing lists - 8. Support and Training - 9. Tracking Development - 10. Thank You - -1. Introduction ---------------- -Tcl provides a powerful platform for creating integration applications that -tie together diverse applications, protocols, devices, and frameworks. -When paired with the Tk toolkit, Tcl provides the fastest and most powerful -way to create GUI applications that run on PCs, Unix, and Mac OS X. -Tcl can also be used for a variety of web-related tasks and for creating -powerful command languages for applications. - -Tcl is maintained, enhanced, and distributed freely by the Tcl community. -Source code development and tracking of bug reports and feature requests -takes place at: - - http://core.tcl.tk/ - -Tcl/Tk release and mailing list services are hosted by SourceForge: - - http://sourceforge.net/projects/tcl/ - -with the Tcl Developer Xchange hosted at: - - http://www.tcl.tk/ - -Tcl is a freely available open source package. You can do virtually -anything you like with it, such as modifying it, redistributing it, -and selling it either in whole or in part. See the file -"license.terms" for complete information. - -2. Documentation ----------------- - -Extensive documentation is available at our website. -The home page for this release, including new features, is - http://www.tcl.tk/software/tcltk/8.6.html - -Detailed release notes can be found at the file distributions page -by clicking on the relevant version. - http://sourceforge.net/projects/tcl/files/Tcl/ - -Information about Tcl itself can be found at - http://www.tcl.tk/about/ - -There have been many Tcl books on the market. Many are mentioned in the Wiki: - http://wiki.tcl.tk/_/ref?N=25206 - -To view the complete set of reference manual entries for Tcl 8.6 online, -visit the URL: - http://www.tcl.tk/man/tcl8.6/ - -2a. Unix Documentation ----------------------- - -The "doc" subdirectory in this release contains a complete set of -reference manual entries for Tcl. Files with extension ".1" are for -programs (for example, tclsh.1); files with extension ".3" are for C -library procedures; and files with extension ".n" describe Tcl -commands. The file "doc/Tcl.n" gives a quick summary of the Tcl -language syntax. To print any of the man pages on Unix, cd to the -"doc" directory and invoke your favorite variant of troff using the -normal -man macros, for example - - ditroff -man Tcl.n - -to print Tcl.n. If Tcl has been installed correctly and your "man" program -supports it, you should be able to access the Tcl manual entries using the -normal "man" mechanisms, such as - - man Tcl - -2b. Windows Documentation -------------------------- - -The "doc" subdirectory in this release contains a complete set of Windows -help files for Tcl. Once you install this Tcl release, a shortcut to the -Windows help Tcl documentation will appear in the "Start" menu: - - Start | Programs | Tcl | Tcl Help - -3. Compiling and installing Tcl -------------------------------- - -There are brief notes in the unix/README, win/README, and macosx/README about -compiling on these different platforms. There is additional information -about building Tcl from sources at - - http://www.tcl.tk/doc/howto/compile.html - -4. Development tools ---------------------------- - -ActiveState produces a high quality set of commercial quality development -tools that is available to accelerate your Tcl application development. -Tcl Dev Kit builds on the earlier TclPro toolset and provides a debugger, -static code checker, single-file wrapping utility, bytecode compiler and -more. More information can be found at - - http://www.ActiveState.com/Tcl - -5. Tcl newsgroup ----------------- - -There is a USENET news group, "comp.lang.tcl", intended for the exchange of -information about Tcl, Tk, and related applications. The newsgroup is a -great place to ask general information questions. For bug reports, please -see the "Support and bug fixes" section below. - -6. Tcl'ers Wiki ---------------- - -A Wiki-based open community site covering all aspects of Tcl/Tk is at: - - http://wiki.tcl.tk/ - -It is dedicated to the Tcl programming language and its extensions. A -wealth of useful information can be found there. It contains code -snippets, references to papers, books, and FAQs, as well as pointers to -development tools, extensions, and applications. You can also recommend -additional URLs by editing the wiki yourself. - -7. Mailing lists ----------------- - -Several mailing lists are hosted at SourceForge to discuss development or -use issues (like Macintosh and Windows topics). For more information and -to subscribe, visit: - - http://sourceforge.net/projects/tcl/ - -and go to the Mailing Lists page. - -8. Support and Training ------------------------- - -We are very interested in receiving bug reports, patches, and suggestions -for improvements. We prefer that you send this information to us as -tickets entered into our tracker at: - - http://core.tcl.tk/tcl/reportlist - -We will log and follow-up on each bug, although we cannot promise a -specific turn-around time. Enhancements may take longer and may not happen -at all unless there is widespread support for them (we're trying to -slow the rate at which Tcl/Tk turns into a kitchen sink). It's very -difficult to make incompatible changes to Tcl/Tk at this point, due to -the size of the installed base. - -The Tcl community is too large for us to provide much individual support -for users. If you need help we suggest that you post questions to -comp.lang.tcl. We read the newsgroup and will attempt to answer esoteric -questions for which no one else is likely to know the answer. In addition, -see the following Web site for links to other organizations that offer -Tcl/Tk training: - - http://wiki.tcl.tk/training - -9. Tracking Development ------------------------ - -Tcl is developed in public. To keep an eye on how Tcl is changing, see - http://core.tcl.tk/ - -10. Thank You -------------- - -We'd like to express our thanks to the Tcl community for all the -helpful suggestions, bug reports, and patches we have received. -Tcl/Tk has improved vastly and will continue to do so with your help. diff --git a/tests/all.tcl b/tests/all.tcl index e14bd9c..89a4f1a 100644 --- a/tests/all.tcl +++ b/tests/all.tcl @@ -22,5 +22,7 @@ if {[singleProcess]} { interp debug {} -frame 1 } -runAllTests +set ErrorOnFailures [info exists env(ERROR_ON_FAILURES)] +unset -nocomplain env(ERROR_ON_FAILURES) +if {[runAllTests] && $ErrorOnFailures} {exit 1} proc exit args {} -- cgit v0.12 From 155f409a383ca0411146efb82246e52ec12270fe Mon Sep 17 00:00:00 2001 From: dkf Date: Wed, 7 Nov 2018 19:22:20 +0000 Subject: Merge the Travis build rules more properly --- .travis.yml | 160 ++++++++++-------------------------------------------------- 1 file changed, 27 insertions(+), 133 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7cf6989..230885d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,25 +1,30 @@ -dist: trusty sudo: false language: c + matrix: include: - os: linux + dist: trusty compiler: clang env: - - MATRIX_EVAL="" BUILD_DIR=unix + - CFGOPT=--enable-shared BUILD_DIR=unix MATRIX_EVAL="" - os: linux + dist: trusty compiler: clang env: - - MATRIX_EVAL="" BUILD_DIR=unix CFGOPT=--disable-shared + - CFGOPT=--disable-shared BUILD_DIR=unix MATRIX_EVAL="" - os: linux + dist: trusty compiler: gcc env: - - MATRIX_EVAL="" BUILD_DIR=unix + - CFGOPT=--enable-shared BUILD_DIR=unix MATRIX_EVAL="" - os: linux + dist: trusty compiler: gcc env: - - MATRIX_EVAL="" BUILD_DIR=unix CFGOPT=--disable-shared + - CFGOPT=--disable-shared BUILD_DIR=unix MATRIX_EVAL="" - os: linux + dist: trusty compiler: gcc addons: apt: @@ -28,8 +33,9 @@ matrix: packages: - g++-4.9 env: - - MATRIX_EVAL="CC=gcc-4.9" BUILD_DIR=unix + - CC=gcc-4.9 BUILD_DIR=unix MATRIX_EVAL="CC=gcc-4.9" - os: linux + dist: trusty compiler: gcc addons: apt: @@ -38,8 +44,9 @@ matrix: packages: - g++-5 env: - - MATRIX_EVAL="CC=gcc-5" BUILD_DIR=unix + - CC=gcc-5 BUILD_DIR=unix MATRIX_EVAL="CC=gcc-5" - os: linux + dist: trusty compiler: gcc addons: apt: @@ -48,8 +55,9 @@ matrix: packages: - g++-6 env: - - MATRIX_EVAL="CC=gcc-6" BUILD_DIR=unix + - CC=gcc-6 BUILD_DIR=unix MATRIX_EVAL="CC=gcc-6" - os: linux + dist: trusty compiler: gcc addons: apt: @@ -58,133 +66,31 @@ matrix: packages: - g++-7 env: - - MATRIX_EVAL="CC=gcc-7" BUILD_DIR=unix + - CC=gcc-7 BUILD_DIR=unix MATRIX_EVAL="CC=gcc-7" - os: osx osx_image: xcode8 env: - - MATRIX_EVAL="" BUILD_DIR=unix + - BUILD_DIR=unix MATRIX_EVAL="" - os: osx osx_image: xcode8 env: - - MATRIX_EVAL="" BUILD_DIR=macosx NO_DIRECT_CONFIGURE=1 + - BUILD_DIR=macosx MATRIX_EVAL="" NO_DIRECT_CONFIGURE=1 - os: osx osx_image: xcode9 env: - - MATRIX_EVAL="" BUILD_DIR=macosx NO_DIRECT_CONFIGURE=1 + - BUILD_DIR=macosx MATRIX_EVAL="" NO_DIRECT_CONFIGURE=1 - os: osx osx_image: xcode10 env: - - MATRIX_EVAL="" BUILD_DIR=macosx NO_DIRECT_CONFIGURE=1 + - BUILD_DIR=macosx MATRIX_EVAL="" NO_DIRECT_CONFIGURE=1 ### C builds not currently supported on Windows instances # - os: windows # env: -# - MATRIX_EVAL="" BUILD_DIR=win - -before_install: - - eval "${MATRIX_EVAL}" - - export ERROR_ON_FAILURES=1 - - cd ${BUILD_DIR} -install: - - test -n "$NO_DIRECT_CONFIGURE" || ./configure ${CFGOPT} -script: - - make - - make test -dist: trusty -sudo: false -language: c -matrix: - include: - - os: linux - compiler: clang - env: - - MATRIX_EVAL="" - - BUILD_DIR=unix - - os: linux - compiler: clang - env: - - MATRIX_EVAL="" - - BUILD_DIR=unix - - CFGOPT=--disable-shared - - os: linux - compiler: gcc - env: - - MATRIX_EVAL="" - - BUILD_DIR=unix - - os: linux - compiler: gcc - env: - - MATRIX_EVAL="" - - BUILD_DIR=unix - - CFGOPT=--disable-shared - - os: linux - compiler: gcc - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++-4.9 - env: - - MATRIX_EVAL="CC=gcc-4.9" - - BUILD_DIR=unix - - os: linux - compiler: gcc - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++-5 - env: - - MATRIX_EVAL="CC=gcc-5" - - BUILD_DIR=unix - - os: linux - compiler: gcc - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++-6 - env: - - MATRIX_EVAL="CC=gcc-6" - - BUILD_DIR=unix - - os: linux - compiler: gcc - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++-7 - env: - - MATRIX_EVAL="CC=gcc-7" - - BUILD_DIR=unix - - os: osx - osx_image: xcode8 - env: - - MATRIX_EVAL="" - - BUILD_DIR=unix - - os: osx - osx_image: xcode8 - env: - - MATRIX_EVAL="" - - BUILD_DIR=macosx - - NO_DIRECT_CONFIGURE=1 - - os: osx - osx_image: xcode9 - env: - - MATRIX_EVAL="" - - BUILD_DIR=macosx - - NO_DIRECT_CONFIGURE=1 - - os: osx - osx_image: xcode10 - env: - - MATRIX_EVAL="" - - BUILD_DIR=macosx - - NO_DIRECT_CONFIGURE=1 +# - BUILD_DIR=win MATRIX_EVAL="" +### ... so proxy with a Mingw cross-compile # Test with mingw-w64 (32 bit) - os: linux + dist: trusty compiler: i686-w64-mingw32-gcc addons: apt: @@ -196,13 +102,10 @@ matrix: - gcc-multilib - wine env: - - MATRIX_EVAL="" - - BUILD_DIR=win - - CFGOPT=--host=i686-w64-mingw32 - - NO_DIRECT_TEST=1 - + - BUILD_DIR=win MATRIX_EVAL="" CFGOPT=--host=i686-w64-mingw32 NO_DIRECT_TEST=1 # Test with mingw-w64 (64 bit) - os: linux + dist: trusty compiler: x86_64-w64-mingw32-gcc addons: apt: @@ -213,16 +116,7 @@ matrix: - gcc-mingw-w64 - wine env: - - MATRIX_EVAL="" - - BUILD_DIR=win - - CFGOPT=--host=x86_64-w64-mingw32 --enable-64bit - - NO_DIRECT_TEST=1 - -### C builds not currently supported on Windows instances -# - os: windows -# env: -# - MATRIX_EVAL="" -# - BUILD_DIR=win + - BUILD_DIR=win MATRIX_EVAL="" CFGOPT="--host=x86_64-w64-mingw32 --enable-64bit" NO_DIRECT_TEST=1 before_install: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then rvm get stable; fi -- cgit v0.12 From cbbc8d66b85371d63ec183c6712ae6c769ab9403 Mon Sep 17 00:00:00 2001 From: dkf Date: Sat, 10 Nov 2018 07:29:08 +0000 Subject: Make the macosx build able to succeed --- macosx/GNUmakefile | 6 ++++-- tests/unixInit.test | 3 +-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/macosx/GNUmakefile b/macosx/GNUmakefile index 54eea8e..a1b7040 100644 --- a/macosx/GNUmakefile +++ b/macosx/GNUmakefile @@ -180,8 +180,10 @@ ifeq (${BUILD_STYLE}_${EMBEDDED_BUILD},Development_) # Deployment build can be installed on top # of Development build without overwriting # the debug library - @cd "${INSTALL_ROOT}${LIBDIR}/${PRODUCT_NAME}.framework/Versions/${VERSION}" && \ - ln -f "${PRODUCT_NAME}" "${PRODUCT_NAME}_debug" + @if [ -d "${INSTALL_ROOT}${LIBDIR}/${PRODUCT_NAME}.framework/Versions/${VERSION}" ]; then \ + cd "${INSTALL_ROOT}${LIBDIR}/${PRODUCT_NAME}.framework/Versions/${VERSION}"; \ + ln -f "${PRODUCT_NAME}" "${PRODUCT_NAME}_debug"; \ + fi endif clean-${PROJECT}: %-${PROJECT}: diff --git a/tests/unixInit.test b/tests/unixInit.test index 05338ed..d0f83f3 100644 --- a/tests/unixInit.test +++ b/tests/unixInit.test @@ -336,8 +336,7 @@ test unixInit-3.1 {TclpSetInitialEncodings} -constraints { return $enc } -cleanup { unset -nocomplain env(LANG) -} -match regexp -result [expr { - ($tcl_platform(os) eq "Darwin") ? "^utf-8$" : "^iso8859-15?$"}] +} -match regexp -result {^(iso8859-15?|utf-8)$} test unixInit-3.2 {TclpSetInitialEncodings} -setup { catch {set oldlc_all $env(LC_ALL)} } -constraints {unix stdio} -body { -- cgit v0.12 From 6fe99b6e66c8a2606658ee482d9f1390ef403b78 Mon Sep 17 00:00:00 2001 From: dkf Date: Sat, 10 Nov 2018 09:39:35 +0000 Subject: Tracking down test failures --- .travis.yml | 3 ++- tests/clock.test | 42 +++++++++++++++++++++++------------------- 2 files changed, 25 insertions(+), 20 deletions(-) diff --git a/.travis.yml b/.travis.yml index 230885d..d810eaf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -127,4 +127,5 @@ install: - test -n "$NO_DIRECT_CONFIGURE" || ./configure ${CFGOPT} script: - make - - test -n "$NO_DIRECT_TEST" || make test + - test -n "$NO_DIRECT_TEST" || make test TESTFLAGS='-notfile socket.test' + - test -n "$NO_DIRECT_TEST" || make test TESTFLAGS='-file socket.test -verbose pt' diff --git a/tests/clock.test b/tests/clock.test index 4ec4db2..3ad5c9f 100644 --- a/tests/clock.test +++ b/tests/clock.test @@ -250,6 +250,16 @@ proc ::testClock::registry { cmd path key } { return [dict get $reg $path $key] } +proc timeWithinDuration {duration start end} { + regexp {([\d.]+)(s|ms|us)} $duration -> duration unit + set delta [expr {$end - $start}] + expr { + ($delta > 0) && ($delta <= $duration) ? + "ok" : + "test should have taken 0-$duration $unit, actually took $delta"} +} + + # Test some of the basics of [clock format] test clock-1.0 "clock format - wrong # args" { @@ -35425,7 +35435,7 @@ test clock-33.2 {clock clicks tests} { set start [clock clicks] after 10 set end [clock clicks] - expr "$end > $start" + expr {$end > $start} } {1} test clock-33.3 {clock clicks tests} { list [catch {clock clicks foo} msg] $msg @@ -35440,27 +35450,21 @@ test clock-33.4a {clock milliseconds} { } {} test clock-33.5 {clock clicks tests, millisecond timing test} { # This test can fail on a system that is so heavily loaded that - # the test takes >60 ms to run. + # the test takes >120 ms to run. set start [clock clicks -milli] after 10 set end [clock clicks -milli] - # 60 msecs seems to be the max time slice under Windows 95/98 - expr { - ($end > $start) && (($end - $start) <= 60) ? - "ok" : - "test should have taken 0-60 ms, actually took [expr $end - $start]"} + # 60 msecs seems to be the max time slice under Windows 95/98; + timeWithinDuration 120ms $start $end } {ok} test clock-33.5a {clock tests, millisecond timing test} { # This test can fail on a system that is so heavily loaded that - # the test takes >60 ms to run. + # the test takes >120 ms to run. set start [clock milliseconds] after 10 set end [clock milliseconds] # 60 msecs seems to be the max time slice under Windows 95/98 - expr { - ($end > $start) && (($end - $start) <= 60) ? - "ok" : - "test should have taken 0-60 ms, actually took [expr $end - $start]"} + timeWithinDuration 120ms $start $end } {ok} test clock-33.6 {clock clicks, milli with too much abbreviation} { list [catch { clock clicks ? } msg] $msg @@ -35471,20 +35475,20 @@ test clock-33.7 {clock clicks, milli with too much abbreviation} { test clock-33.8 {clock clicks test, microsecond timing test} { # This test can fail on a system that is so heavily loaded that - # the test takes >60 ms to run. + # the test takes >120 ms to run. set start [clock clicks -micro] after 10 set end [clock clicks -micro] - expr {($end > $start) && (($end - $start) <= 60000)} -} {1} + timeWithinDuration 120000us $start $end +} {ok} test clock-33.8a {clock test, microsecond timing test} { # This test can fail on a system that is so heavily loaded that - # the test takes >60 ms to run. + # the test takes >120 ms to run. set start [clock microseconds] after 10 set end [clock microseconds] - expr {($end > $start) && (($end - $start) <= 60000)} -} {1} + timeWithinDuration 120000us $start $end +} {ok} test clock-33.9 {clock clicks test, millis align with seconds} { set t1 [clock seconds] @@ -35826,7 +35830,7 @@ test clock-35.3 {clock seconds tests} { set start [clock seconds] after 2000 set end [clock seconds] - expr "$end > $start" + expr {$end > $start} } {1} -- cgit v0.12 From b82e9669618dda939dcedae14fdcc9f9cab087ff Mon Sep 17 00:00:00 2001 From: dkf Date: Sat, 10 Nov 2018 09:55:31 +0000 Subject: Build instructions tinkering --- .travis.yml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index d810eaf..b11e6c2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,22 +7,22 @@ matrix: dist: trusty compiler: clang env: - - CFGOPT=--enable-shared BUILD_DIR=unix MATRIX_EVAL="" + - CFGOPT=--enable-shared BUILD_DIR=unix - os: linux dist: trusty compiler: clang env: - - CFGOPT=--disable-shared BUILD_DIR=unix MATRIX_EVAL="" + - CFGOPT=--disable-shared BUILD_DIR=unix - os: linux dist: trusty compiler: gcc env: - - CFGOPT=--enable-shared BUILD_DIR=unix MATRIX_EVAL="" + - CFGOPT=--enable-shared BUILD_DIR=unix - os: linux dist: trusty compiler: gcc env: - - CFGOPT=--disable-shared BUILD_DIR=unix MATRIX_EVAL="" + - CFGOPT=--disable-shared BUILD_DIR=unix - os: linux dist: trusty compiler: gcc @@ -47,7 +47,7 @@ matrix: - CC=gcc-5 BUILD_DIR=unix MATRIX_EVAL="CC=gcc-5" - os: linux dist: trusty - compiler: gcc + compiler: gcc-6 addons: apt: sources: @@ -55,7 +55,7 @@ matrix: packages: - g++-6 env: - - CC=gcc-6 BUILD_DIR=unix MATRIX_EVAL="CC=gcc-6" + - BUILD_DIR=unix - os: linux dist: trusty compiler: gcc @@ -70,23 +70,23 @@ matrix: - os: osx osx_image: xcode8 env: - - BUILD_DIR=unix MATRIX_EVAL="" + - BUILD_DIR=unix - os: osx osx_image: xcode8 env: - - BUILD_DIR=macosx MATRIX_EVAL="" NO_DIRECT_CONFIGURE=1 + - BUILD_DIR=macosx NO_DIRECT_CONFIGURE=1 - os: osx osx_image: xcode9 env: - - BUILD_DIR=macosx MATRIX_EVAL="" NO_DIRECT_CONFIGURE=1 + - BUILD_DIR=macosx NO_DIRECT_CONFIGURE=1 - os: osx osx_image: xcode10 env: - - BUILD_DIR=macosx MATRIX_EVAL="" NO_DIRECT_CONFIGURE=1 + - BUILD_DIR=macosx NO_DIRECT_CONFIGURE=1 ### C builds not currently supported on Windows instances # - os: windows # env: -# - BUILD_DIR=win MATRIX_EVAL="" +# - BUILD_DIR=win ### ... so proxy with a Mingw cross-compile # Test with mingw-w64 (32 bit) - os: linux @@ -102,7 +102,7 @@ matrix: - gcc-multilib - wine env: - - BUILD_DIR=win MATRIX_EVAL="" CFGOPT=--host=i686-w64-mingw32 NO_DIRECT_TEST=1 + - BUILD_DIR=win CFGOPT=--host=i686-w64-mingw32 NO_DIRECT_TEST=1 # Test with mingw-w64 (64 bit) - os: linux dist: trusty @@ -116,7 +116,7 @@ matrix: - gcc-mingw-w64 - wine env: - - BUILD_DIR=win MATRIX_EVAL="" CFGOPT="--host=x86_64-w64-mingw32 --enable-64bit" NO_DIRECT_TEST=1 + - BUILD_DIR=win CFGOPT="--host=x86_64-w64-mingw32 --enable-64bit" NO_DIRECT_TEST=1 before_install: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then rvm get stable; fi @@ -127,5 +127,5 @@ install: - test -n "$NO_DIRECT_CONFIGURE" || ./configure ${CFGOPT} script: - make - - test -n "$NO_DIRECT_TEST" || make test TESTFLAGS='-notfile socket.test' - - test -n "$NO_DIRECT_TEST" || make test TESTFLAGS='-file socket.test -verbose pt' + - test -n "$NO_DIRECT_TEST" || make test TESTFLAGS='-notfile socket.test' styles=develop + - test -n "$NO_DIRECT_TEST" || make test TESTFLAGS='-file socket.test -verbose pt' styles=develop -- cgit v0.12 From 13f704914ae916a8e298edfa0d730482b1c74d89 Mon Sep 17 00:00:00 2001 From: dkf Date: Sun, 11 Nov 2018 15:07:12 +0000 Subject: Clean up Travis config now that it passes --- .travis.yml | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index b11e6c2..a2a59fc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ matrix: dist: trusty compiler: clang env: - - CFGOPT=--enable-shared BUILD_DIR=unix + - BUILD_DIR=unix - os: linux dist: trusty compiler: clang @@ -17,7 +17,7 @@ matrix: dist: trusty compiler: gcc env: - - CFGOPT=--enable-shared BUILD_DIR=unix + - BUILD_DIR=unix - os: linux dist: trusty compiler: gcc @@ -25,7 +25,7 @@ matrix: - CFGOPT=--disable-shared BUILD_DIR=unix - os: linux dist: trusty - compiler: gcc + compiler: gcc-4.9 addons: apt: sources: @@ -33,10 +33,10 @@ matrix: packages: - g++-4.9 env: - - CC=gcc-4.9 BUILD_DIR=unix MATRIX_EVAL="CC=gcc-4.9" + - BUILD_DIR=unix - os: linux dist: trusty - compiler: gcc + compiler: gcc-5 addons: apt: sources: @@ -44,7 +44,7 @@ matrix: packages: - g++-5 env: - - CC=gcc-5 BUILD_DIR=unix MATRIX_EVAL="CC=gcc-5" + - BUILD_DIR=unix - os: linux dist: trusty compiler: gcc-6 @@ -58,7 +58,7 @@ matrix: - BUILD_DIR=unix - os: linux dist: trusty - compiler: gcc + compiler: gcc-7 addons: apt: sources: @@ -66,7 +66,7 @@ matrix: packages: - g++-7 env: - - CC=gcc-7 BUILD_DIR=unix MATRIX_EVAL="CC=gcc-7" + - BUILD_DIR=unix - os: osx osx_image: xcode8 env: @@ -120,12 +120,11 @@ matrix: before_install: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then rvm get stable; fi - - eval "${MATRIX_EVAL}" - export ERROR_ON_FAILURES=1 - cd ${BUILD_DIR} install: - test -n "$NO_DIRECT_CONFIGURE" || ./configure ${CFGOPT} script: - make - - test -n "$NO_DIRECT_TEST" || make test TESTFLAGS='-notfile socket.test' styles=develop - - test -n "$NO_DIRECT_TEST" || make test TESTFLAGS='-file socket.test -verbose pt' styles=develop + # The styles=develop avoids some weird problems on OSX + - test -n "$NO_DIRECT_TEST" || make test styles=develop -- cgit v0.12 From fc38a30572b56187498c4cc8f3721a26e919cdcf Mon Sep 17 00:00:00 2001 From: dkf Date: Mon, 12 Nov 2018 09:49:24 +0000 Subject: Cleaner way of writing environment variables --- .travis.yml | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index a2a59fc..947e858 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,8 @@ matrix: dist: trusty compiler: clang env: - - CFGOPT=--disable-shared BUILD_DIR=unix + - CFGOPT=--disable-shared + - BUILD_DIR=unix - os: linux dist: trusty compiler: gcc @@ -22,7 +23,8 @@ matrix: dist: trusty compiler: gcc env: - - CFGOPT=--disable-shared BUILD_DIR=unix + - CFGOPT=--disable-shared + - BUILD_DIR=unix - os: linux dist: trusty compiler: gcc-4.9 @@ -74,15 +76,18 @@ matrix: - os: osx osx_image: xcode8 env: - - BUILD_DIR=macosx NO_DIRECT_CONFIGURE=1 + - BUILD_DIR=macosx + - NO_DIRECT_CONFIGURE=1 - os: osx osx_image: xcode9 env: - - BUILD_DIR=macosx NO_DIRECT_CONFIGURE=1 + - BUILD_DIR=macosx + - NO_DIRECT_CONFIGURE=1 - os: osx osx_image: xcode10 env: - - BUILD_DIR=macosx NO_DIRECT_CONFIGURE=1 + - BUILD_DIR=macosx + - NO_DIRECT_CONFIGURE=1 ### C builds not currently supported on Windows instances # - os: windows # env: @@ -102,7 +107,9 @@ matrix: - gcc-multilib - wine env: - - BUILD_DIR=win CFGOPT=--host=i686-w64-mingw32 NO_DIRECT_TEST=1 + - BUILD_DIR=win + - CFGOPT=--host=i686-w64-mingw32 + - NO_DIRECT_TEST=1 # Test with mingw-w64 (64 bit) - os: linux dist: trusty @@ -116,7 +123,9 @@ matrix: - gcc-mingw-w64 - wine env: - - BUILD_DIR=win CFGOPT="--host=x86_64-w64-mingw32 --enable-64bit" NO_DIRECT_TEST=1 + - BUILD_DIR=win + - CFGOPT="--host=x86_64-w64-mingw32 --enable-64bit" + - NO_DIRECT_TEST=1 before_install: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then rvm get stable; fi -- cgit v0.12