005-init_ts.exp (modules-5.1.1.tar.bz2) | : | 005-init_ts.exp (modules-5.2.0.tar.bz2) | ||
---|---|---|---|---|
skipping to change at line 68 | skipping to change at line 68 | |||
&& $tcl_platform(os) ne "Darwin"\ | && $tcl_platform(os) ne "Darwin"\ | |||
&& ![string match "CYGWIN*" $tcl_platform(os)]\ | && ![string match "CYGWIN*" $tcl_platform(os)]\ | |||
&& ![string match "MINGW*" $tcl_platform(os)]\ | && ![string match "MINGW*" $tcl_platform(os)]\ | |||
&& ![string match "MSYS_NT*" $tcl_platform(os)])} { | && ![string match "MSYS_NT*" $tcl_platform(os)])} { | |||
set sh_strict 1 | set sh_strict 1 | |||
} else { | } else { | |||
set sh_strict 0 | set sh_strict 0 | |||
} | } | |||
send_user "\tsh_strict is '$sh_strict'\n" | send_user "\tsh_strict is '$sh_strict'\n" | |||
# grab bash shell version | ||||
set bashbin [find_bin bash] | ||||
if {$bashbin ne {}} { | ||||
set bash_version [exec $bashbin -c {echo $BASH_VERSION}] | ||||
set bash_version_is52 [string match 5.2.* $bash_version] | ||||
send_user "\tbash_version_is52 is '$bash_version_is52'\n" | ||||
} | ||||
# check SIP is enabled or not on OS X | # check SIP is enabled or not on OS X | |||
if {$tcl_platform(os) eq "Darwin"} { | if {$tcl_platform(os) eq "Darwin"} { | |||
catch { | catch { | |||
regexp {System Integrity Protection status: enabled.} [exec csrutil stat us] csrutil_enabled | regexp {System Integrity Protection status: enabled.} [exec csrutil stat us] csrutil_enabled | |||
} errMsg | } errMsg | |||
} | } | |||
if {[info exists csrutil_enabled]} { | if {[info exists csrutil_enabled]} { | |||
set sip_enabled 1 | set sip_enabled 1 | |||
unset csrutil_enabled | unset csrutil_enabled | |||
} else { | } else { | |||
skipping to change at line 104 | skipping to change at line 112 | |||
# properties to test the different available shells | # properties to test the different available shells | |||
set shell_list {} | set shell_list {} | |||
set shell_sh_family {} | set shell_sh_family {} | |||
set shell_redir_list {} | set shell_redir_list {} | |||
array set shell_init {} | array set shell_init {} | |||
array set shell_path {} | array set shell_path {} | |||
array set shell_opts {} | array set shell_opts {} | |||
array set shell_test {} | array set shell_test {} | |||
foreach shell [list sh bash basheu ksh zsh csh tcsh fish tcl perl python ruby cm ake r] { | foreach shell [list sh bash basheu ksh zsh csh tcsh fish tcl perl python ruby cm ake r] { | |||
if {$shell eq {basheu} && $bash_version_is52} { | ||||
send_user "\t'basheu' shell tests ignored on Bash 5.2\n" | ||||
continue | ||||
} | ||||
switch -- $shell { | switch -- $shell { | |||
tcl { | tcl { | |||
set shellbin $install_tclsh | set shellbin $install_tclsh | |||
} | } | |||
r { | r { | |||
set shellbin [find_bin Rscript] | set shellbin [find_bin Rscript] | |||
} | } | |||
basheu { | basheu { | |||
set shellbin [find_bin bash] | set shellbin [find_bin bash] | |||
} | } | |||
skipping to change at line 237 | skipping to change at line 249 | |||
catch {unset vvlist} | catch {unset vvlist} | |||
catch {unset vname} | catch {unset vname} | |||
} | } | |||
# locate siteconfig file | # locate siteconfig file | |||
set siteconfig_file "$install_etcdir/siteconfig.tcl" | set siteconfig_file "$install_etcdir/siteconfig.tcl" | |||
# determine if siteconfig forces stderr terminal attachment state | # determine if siteconfig forces stderr terminal attachment state | |||
proc siteconfig_isStderrTty {} { | proc siteconfig_isStderrTty {} { | |||
interp create _siteconfig | interp create _siteconfig | |||
interp eval _siteconfig set ::siteconfig_file $::siteconfig_file | interp eval _siteconfig set ::siteconfig_file "{$::siteconfig_file}" | |||
set is_stderr_tty [interp eval _siteconfig { | set is_stderr_tty [interp eval _siteconfig { | |||
set is_stderr_tty 0 | set is_stderr_tty 0 | |||
if {[file readable $::siteconfig_file]} { | if {[file readable $::siteconfig_file]} { | |||
# evaluate siteconfig file to check initStateIsStderrTty procedure | # evaluate siteconfig file to check initStateIsStderrTty procedure | |||
catch { | catch { | |||
source $::siteconfig_file | source $::siteconfig_file | |||
if {[info procs initStateIsStderrTty] eq "initStateIsStderrTty"} { | if {[info procs initStateIsStderrTty] eq "initStateIsStderrTty"} { | |||
set is_stderr_tty [initStateIsStderrTty] | set is_stderr_tty [initStateIsStderrTty] | |||
} | } | |||
} errorMsg | } errorMsg | |||
End of changes. 3 change blocks. | ||||
1 lines changed or deleted | 13 lines changed or added |