diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-09-25 12:16:48 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-09-25 12:16:48 (GMT) |
| commit | 21b10cef381ba4d268e285e46454ccb1529af85d (patch) | |
| tree | 00c594ab23e3207b0293838fe09305ac0c6ce28d | |
| parent | b8b008ad8448ffa35ffb8816dd870ddfd7b7f77b (diff) | |
| parent | 26bb60bef7dec62eac26ce44a6397c0958626cf4 (diff) | |
| download | tcl-21b10cef381ba4d268e285e46454ccb1529af85d.zip tcl-21b10cef381ba4d268e285e46454ccb1529af85d.tar.gz tcl-21b10cef381ba4d268e285e46454ccb1529af85d.tar.bz2 | |
Merge 8.7
| -rw-r--r-- | .travis.yml | 32 | ||||
| -rw-r--r-- | tests/uplevel.test | 2 |
2 files changed, 10 insertions, 24 deletions
diff --git a/.travis.yml b/.travis.yml index 9ccfc25..a3b4b7d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,8 @@ language: c addons: apt: + sources: + - ubuntu-toolchain-r-test packages: - binutils-mingw-w64-i686 - binutils-mingw-w64-x86-64 @@ -11,7 +13,7 @@ addons: - gcc-multilib jobs: include: -# Testing on Linux with various compilers +# Testing on Linux GCC - name: "Linux/GCC/Shared" os: linux dist: focal @@ -61,29 +63,15 @@ jobs: env: - BUILD_DIR=unix - CFGOPT="CC=g++ CFLAGS=-Dregister=dont+use+register" -# Older versions of GCC... - - name: "Linux/GCC 7/Shared" +# Newer/Older versions of GCC + - name: "Linux/GCC 10/Shared" os: linux dist: focal - compiler: gcc-7 + compiler: gcc-10 addons: apt: - sources: - - ubuntu-toolchain-r-test packages: - - g++-7 - env: - - BUILD_DIR=unix - - name: "Linux/GCC 6/Shared" - os: linux - dist: bionic - compiler: gcc-6 - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++-6 + - g++-10 env: - BUILD_DIR=unix - name: "Linux/GCC 5/Shared" @@ -92,13 +80,11 @@ jobs: compiler: gcc-5 addons: apt: - sources: - - ubuntu-toolchain-r-test packages: - g++-5 env: - BUILD_DIR=unix -# Clang +# Testing on Linux Clang - name: "Linux/Clang/Shared" os: linux dist: focal @@ -457,6 +443,6 @@ install: before_script: - export ERROR_ON_FAILURES=1 script: - - make all tcltest + - make all tcltest || echo "Something wrong, maybe a hickup, let's try again" - make test - make install diff --git a/tests/uplevel.test b/tests/uplevel.test index 5dc2806..4ee6a34 100644 --- a/tests/uplevel.test +++ b/tests/uplevel.test @@ -309,7 +309,7 @@ test uplevel-7.3 {var access, LVT in upper level} -setup { test uplevel-8.0 { string representation isn't generated when there is only one argument } -body { - set res {} + set res {} set script [list lindex 5] lappend res [apply {script { uplevel $script |