ts: adapt existing tests for logging feature

This commit is contained in:
Xavier Delaruelle
2024-04-29 20:46:40 +02:00
parent c75e58a6ce
commit fd03f86eaf
5 changed files with 16 additions and 1 deletions

View File

@@ -84,6 +84,9 @@ proc pager_test_case {modarg use asked cmd opts} {
lappend ans "DEBUG setState: reportfd set to '$reportfd'"
lappend ans "DEBUG setState: timer set to '0'"
lappend ans $::vers_reportre
lappend ans "DEBUG setConf: logger set to '$::install_loggercmd'"
lappend ans "DEBUG setState: logging set to '0'"
lappend ans "DEBUG setState: logfd set to ''"
testouterr_cmd_re "sh" "-V -D$modarg" "" [join $ans "\n"]
}

View File

@@ -65,6 +65,9 @@ proc test_getSiteConfig {siteconfig isvalid islocked} {
lappend ans "DEBUG setState: reportfd set to 'stderr'"
lappend ans "DEBUG setState: timer set to '0'"
lappend ans $::vers_reportre
lappend ans "DEBUG setConf: logger set to '$::install_loggercmd'"
lappend ans "DEBUG setState: logging set to '0'"
lappend ans "DEBUG setState: logfd set to ''"
setenv_var MODULES_SITECONFIG $siteconfig
testouterr_cmd_re sh {--no-pager -D -V} {} [join $ans \n]
@@ -106,6 +109,9 @@ lappend ans "DEBUG setState: report_format set to 'regular'"
lappend ans "DEBUG setState: reportfd set to 'file\\d'"
lappend ans "DEBUG setState: timer set to '0'"
lappend ans $vers_reportre
lappend ans "DEBUG setConf: logger set to '$install_loggercmd'"
lappend ans "DEBUG setState: logging set to '0'"
lappend ans "DEBUG setState: logfd set to ''"
testouterr_cmd_re "sh" "-V" "" [join $ans "\n"]
# test variable superseding of regular siteconfig file by additional siteconfig file if enabled

View File

@@ -59,6 +59,9 @@ if {[info exists tclextlib_file]} {
lappend ans "DEBUG setState: reportfd set to 'stderr'"
lappend ans "DEBUG setState: timer set to '0'"
lappend ans $vers_reportre
lappend ans "DEBUG setConf: logger set to '$::install_loggercmd'"
lappend ans "DEBUG setState: logging set to '0'"
lappend ans "DEBUG setState: logfd set to ''"
testouterr_cmd_re sh {--no-pager -D -V} {} [join $ans \n]
restore_file_perms $tclextlib_file

View File

@@ -29,6 +29,7 @@ lappend ans "DEBUG Load Tcl extension library \\($tclextlib_file\\)"
lappend ans {DEBUG setState: tcl_ext_lib_loaded set to '1'}
lappend ans {(.*)+}
lappend ans $vers_reportre
lappend ans {(.*)+}
testouterr_cmd_re sh {-D -V} OK [join $ans \n] 1
file mkdir lib64
@@ -41,6 +42,7 @@ lappend ans "DEBUG Load Tcl extension library \\($tclextlib_alt_file\\)"
lappend ans {DEBUG setState: tcl_ext_lib_loaded set to '1'}
lappend ans {(.*)+}
lappend ans $vers_reportre
lappend ans {(.*)+}
testouterr_cmd_re sh {-D -V} OK [join $ans \n] 1
file delete $tclextlib_alt_file

View File

@@ -130,7 +130,8 @@ $modlin
(DEBUG .*)+
DEBUG renderSettings: 2 error\\\(s\\\) detected.
DEBUG setState: false_rendered set to '1'
DEBUG setState: shelltype set to 'csh'"
DEBUG setState: shelltype set to 'csh'
(DEBUG .*)+"
set out_pat_4 "$modlin
$modpathre/test/2.0: