diff options
| author | dkf <donal.k.fellows@manchester.ac.uk> | 2018-10-21 10:16:05 (GMT) |
|---|---|---|
| committer | dkf <donal.k.fellows@manchester.ac.uk> | 2018-10-21 10:16:05 (GMT) |
| commit | 0c78f5bbada0703c8063287e2e063604c4023ba7 (patch) | |
| tree | 3681bd86e5eeb8d13b50a1941bb888679aa5728e | |
| parent | 2e0a0b53053f3699f0593ca9e50b5ba45a548da1 (diff) | |
| download | tcl-0c78f5bbada0703c8063287e2e063604c4023ba7.zip tcl-0c78f5bbada0703c8063287e2e063604c4023ba7.tar.gz tcl-0c78f5bbada0703c8063287e2e063604c4023ba7.tar.bz2 | |
Disable windows builds. Make test failures fatal.
| -rw-r--r-- | .travis.yml | 12 | ||||
| -rw-r--r-- | library/tcltest/tcltest.tcl | 4 | ||||
| -rw-r--r-- | tests/all.tcl | 4 |
3 files changed, 12 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml index 3abeb6b..d5c93c1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -48,16 +48,18 @@ matrix: - os: osx osx_image: xcode8 env: - - MATRIX_EVAL="BUILD_DIR=macosx" - - os: windows - env: - - MATRIX_EVAL="BUILD_DIR=win" + - 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: - - ./configure + - test -z "$NO_DIRECT_CONFIGURE" || ./configure script: - make - make test diff --git a/library/tcltest/tcltest.tcl b/library/tcltest/tcltest.tcl index 8e43859..0d55ff7 100644 --- a/library/tcltest/tcltest.tcl +++ b/library/tcltest/tcltest.tcl @@ -2696,7 +2696,7 @@ proc tcltest::GetMatchingDirectories {rootdir} { # shell being tested # # Results: -# None. +# Whether there were any failures. # # Side effects: # None. @@ -2842,7 +2842,7 @@ proc tcltest::runAllTests { {shell ""} } { puts [outputChannel] "" puts [outputChannel] [string repeat ~ 44] } - return + return [info exists testFileFailures] } ##################################################################### diff --git a/tests/all.tcl b/tests/all.tcl index d01a54d..f3463c6 100644 --- a/tests/all.tcl +++ b/tests/all.tcl @@ -14,4 +14,6 @@ package require Tcl 8.5 package require tcltest 2.2 namespace import tcltest::* configure {*}$argv -testdir [file dir [info script]] -runAllTests +set ErrorOnFailures [info exists env(ERROR_ON_FAILURES)] +unset -nocomplain env(ERROR_ON_FAILURES) +if {[runAllTests] && $ErrorOnFailures} {exit 1} |