Tcl Source Code

Check-in [bdc17c4308]
Login
Bounty program for improvements to Tcl and certain Tcl packages.
Tcl 2019 Conference, Houston/TX, US, Nov 4-8
Send your abstracts to tclconference@googlegroups.com
or submit via the online form by Sep 9.

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Fix builds on Travis.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | core-8-5-branch
Files: files | file ages | folders
SHA3-256:bdc17c43080d1ed6e51fa43ddfa3fde33d165e71247c61d3b7b6ebe855424756
User & Date: dkf 2018-11-11 16:55:53
Context
2018-11-12
09:26
Fix brokenness in GNUmakefile check-in: 38bd0e8890 user: dkf tags: core-8-5-branch
2018-11-11
16:55
Fix builds on Travis. check-in: bdc17c4308 user: dkf tags: core-8-5-branch
2018-11-09
16:00
[35a8f1c04a] Fix bad lengths when creating string rep of some lists. check-in: b2575c74bc user: dgp tags: core-8-5-branch
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to .travis.yml.

1
2
3

4
5
6

7
8
9
10
11

12
13
14
15
16

17

18
19
20
21
22

23
24
25
26
27

28

29
30
31
32
33
34
35
36
37
38
39

40
41
42
43
44
45
46
47
48
49
50

51
52
53
54
55
56
57
58
59
60
61

62
63
64
65
66
67
68
69
70



71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94





95
96

97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114

115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144

145
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





# Test with mingw-w64 (32 bit)
    - os: linux

      compiler: i686-w64-mingw32-gcc
      addons:
        apt:
          packages:
            - gcc-mingw-w64-base
            - binutils-mingw-w64-i686
            - gcc-mingw-w64-i686
            - gcc-mingw-w64
            - gcc-multilib
            - wine
      env:
        - MATRIX_EVAL=""
        - BUILD_DIR=win
        - CFGOPT=--host=i686-w64-mingw32
        - NO_DIRECT_TEST=1

# Test with mingw-w64 (64 bit)
    - os: linux

      compiler: x86_64-w64-mingw32-gcc
      addons:
        apt:
          packages:
            - gcc-mingw-w64-base
            - binutils-mingw-w64-x86-64
            - gcc-mingw-w64-x86-64
            - 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

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
<


>



>


<


>


<
<

>

>


<


>


<
<

>

>
|







<


>
|







<


>
|







<


>
|







|
>
>
>




<
<
<
<
<
<





<





<


>
>
>
>
>


>











<



<


>










<

|


<
<
<
<
<
<


<






>
|

1
2
3
4
5
6
7
8
9

10
11
12
13
14


15
16
17
18
19
20

21
22
23
24
25


26
27
28
29
30
31
32
33
34
35
36
37

38
39
40
41
42
43
44
45
46
47
48

49
50
51
52
53
54
55
56
57
58
59

60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78






79
80
81
82
83

84
85
86
87
88

89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109

110
111
112

113
114
115
116
117
118
119
120
121
122
123
124
125

126
127
128
129






130
131

132
133
134
135
136
137
138
139

sudo: false
language: c

matrix:
  include:
    - os: linux
      dist: trusty
      compiler: clang
      env:

        - BUILD_DIR=unix
    - os: linux
      dist: trusty
      compiler: clang
      env:


        - CFGOPT=--disable-shared
        - BUILD_DIR=unix
    - os: linux
      dist: trusty
      compiler: gcc
      env:

        - BUILD_DIR=unix
    - os: linux
      dist: trusty
      compiler: gcc
      env:


        - CFGOPT=--disable-shared
        - BUILD_DIR=unix
    - os: linux
      dist: trusty
      compiler: gcc-4.9
      addons:
        apt:
          sources:
            - ubuntu-toolchain-r-test
          packages:
            - g++-4.9
      env:

        - BUILD_DIR=unix
    - os: linux
      dist: trusty
      compiler: gcc-5
      addons:
        apt:
          sources:
            - ubuntu-toolchain-r-test
          packages:
            - g++-5
      env:

        - BUILD_DIR=unix
    - os: linux
      dist: trusty
      compiler: gcc-6
      addons:
        apt:
          sources:
            - ubuntu-toolchain-r-test
          packages:
            - g++-6
      env:

        - BUILD_DIR=unix
    - os: linux
      dist: trusty
      compiler: gcc-7
      addons:
        apt:
          sources:
            - ubuntu-toolchain-r-test
          packages:
            - g++-7
      env:
        - BUILD_DIR=unix
    - os: osx
      osx_image: xcode8
      env:
        - BUILD_DIR=unix
    - os: osx
      osx_image: xcode8
      env:






        - BUILD_DIR=macosx
        - NO_DIRECT_CONFIGURE=1
    - os: osx
      osx_image: xcode9
      env:

        - BUILD_DIR=macosx
        - NO_DIRECT_CONFIGURE=1
    - os: osx
      osx_image: xcode10
      env:

        - BUILD_DIR=macosx
        - NO_DIRECT_CONFIGURE=1
### 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
      dist: trusty
      compiler: i686-w64-mingw32-gcc
      addons:
        apt:
          packages:
            - gcc-mingw-w64-base
            - binutils-mingw-w64-i686
            - gcc-mingw-w64-i686
            - gcc-mingw-w64
            - gcc-multilib
            - wine
      env:

        - BUILD_DIR=win
        - 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:
          packages:
            - gcc-mingw-w64-base
            - binutils-mingw-w64-x86-64
            - gcc-mingw-w64-x86-64
            - gcc-mingw-w64
            - wine
      env:

        - 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

  - export ERROR_ON_FAILURES=1
  - cd ${BUILD_DIR}
install:
  - test -n "$NO_DIRECT_CONFIGURE" || ./configure ${CFGOPT}
script:
  - make
  # The styles=develop avoids some weird problems on OSX
  - test -n "$NO_DIRECT_TEST" || make test styles=develop

Changes to tests/unixInit.test.

345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
    set f [open "|[list [interpreter]]" w+]
    chan configure $f -buffering none
    puts $f {puts [encoding system]; exit}
    set enc [gets $f]
    close $f
    unset env(LANG)
    set enc
} -match regexp -result [expr {
	($tcl_platform(os) eq "Darwin") ? "^utf-8$" : "^iso8859-15?$"}]
test unixInit-3.2 {TclpSetInitialEncodings} {unix stdio} {
    set env(LANG) japanese
    catch {set oldlc_all $env(LC_ALL)}
    set env(LC_ALL) japanese
    set f [open "|[list [interpreter]]" w+]
    chan configure $f -buffering none
    puts $f {puts [encoding system]; exit}







|
<







345
346
347
348
349
350
351
352

353
354
355
356
357
358
359
    set f [open "|[list [interpreter]]" w+]
    chan configure $f -buffering none
    puts $f {puts [encoding system]; exit}
    set enc [gets $f]
    close $f
    unset env(LANG)
    set enc
} -match regexp -result {^(iso8859-15?|utf-8)$}

test unixInit-3.2 {TclpSetInitialEncodings} {unix stdio} {
    set env(LANG) japanese
    catch {set oldlc_all $env(LC_ALL)}
    set env(LC_ALL) japanese
    set f [open "|[list [interpreter]]" w+]
    chan configure $f -buffering none
    puts $f {puts [encoding system]; exit}