Skip to content

Commit b50f19d

Browse files
committed
Fix constraints on unixInit-3.2. See https://sourceforge.net/p/tcl/mailman/message/59255593/
1 parent 6092b84 commit b50f19d

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

tests/unixInit.test

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -97,16 +97,16 @@ test unixInit-3.1 {TclpSetInitialEncodings} -constraints {
9797
unset -nocomplain env(LANG)
9898
} -match regexp -result {^(iso8859-15?|utf-8)$}
9999

100-
# unixInit-3.2 depends on the *spawned* [interpreter] being able to locate
101-
# tcl_library without setting of TCL_LIBRARY env. This in turn depends on
102-
# Tcl's "library" directory being under the parent or grandparent of the
103-
# executable directory (the initScript search path in tclInterp.c).
104-
# Thus this constraint. On GiuHub CI, the only time this is not true
105-
# is for the XCode builds.
106-
if {[string match [zipfs root]* [info library]] ||
107-
[file isfile [file normalize [file join [info nameofexecutable] .. .. library init.tcl]]] ||
108-
[file isfile [file normalize [file join [info nameofexecutable] .. .. .. library init.tcl]]]
109-
} {
100+
# This test is fundamentally flawed as noted in the core mailing list at
101+
# https://sourceforge.net/p/tcl/mailman/message/59255593/. Basically, it
102+
# assumes (for non-zipfs) builds to run under the source directory and TIP 732
103+
# no longer includes ....library in its search path. Therefore only run it on
104+
# zipfs builds though even there it is superfluous since the test suite does
105+
# not set TCL_LIBRARY for zipfs builds anyways so unsetting it has no
106+
# effect. To really test Tcl's search paths, a better test is needed where
107+
# the shell is spawned after installation and not the one in the build
108+
# directory.
109+
if {[string match [zipfs root]* [info library]]} {
110110
tcltest::testConstraint enableUnixInit32 1
111111
} else {
112112
tcltest::testConstraint enableUnixInit32 0

0 commit comments

Comments
 (0)