From a9dc1ec4fc443f4a232d38111ba5cdab54ab0bb3 Mon Sep 17 00:00:00 2001 From: Xavier Delaruelle Date: Tue, 19 Oct 2021 07:05:50 +0200 Subject: [PATCH] ts: fix --return-value tests for Tcl8.5 in 50/{260,472} --- testsuite/modules.50-cmds/260-getenv.exp | 22 ++++++++------- testsuite/modules.50-cmds/472-getvariant.exp | 28 +++++++++++--------- 2 files changed, 29 insertions(+), 21 deletions(-) diff --git a/testsuite/modules.50-cmds/260-getenv.exp b/testsuite/modules.50-cmds/260-getenv.exp index 973cd0db..ae071130 100644 --- a/testsuite/modules.50-cmds/260-getenv.exp +++ b/testsuite/modules.50-cmds/260-getenv.exp @@ -76,25 +76,28 @@ testouterr_cmd_re "sh" "display $module" "OK" "$modlin\n$modulefilere:\n\nsetenv # setenv_var TESTSUITE_GETENV toomany1 -set tserr [msg_load $module [msg_moderr {wrong # args: should be "getenv ?--return-value? variable ?valifundef?"} {getenv TEST {} other} $modulefile 33]] -testouterr_cmd sh "load $module" ERR $tserr +set ln [expr {[cmpversion $tclsh_version 8.5] < 1 ? {30} : {33}}] +set tserr [escre [msg_load $module [msg_moderr {wrong # args: should be "getenv ?--return-value? variable ?valifundef?"} {getenv TEST {} other} $modulefile $ln]]] +testouterr_cmd_re sh "load $module" ERR $tserr set tserr "$modlin $modulefilere: setenv\\s*testsuite\\s*\\\$TEST setenv\\s*testsuite2\\s*\\\$TEST2 -[escre [msg_moderr {wrong # args: should be "getenv ?--return-value? variable ?valifundef?"} {getenv TEST {} other} $modulefile 33 { }]] +[escre [msg_moderr {wrong # args: should be "getenv ?--return-value? variable ?valifundef?"} {getenv TEST {} other} $modulefile $ln { }]] $modlin" testouterr_cmd_re sh "display $module" ERR $tserr setenv_var TESTSUITE_GETENV toomany2 -set tserr [msg_load $module [msg_moderr {wrong # args: should be "getenv ?--return-value? variable ?valifundef?"} {getenv --return-value TEST {} other} $modulefile 36]] -testouterr_cmd sh "load $module" ERR $tserr +set ln [expr {[cmpversion $tclsh_version 8.5] < 1 ? {30} : {36}}] +set tserr [escre [msg_load $module [msg_moderr {wrong # args: should be "getenv ?--return-value? variable ?valifundef?"} {getenv --return-value TEST {} other} $modulefile $ln]]] +testouterr_cmd_re sh "load $module" ERR $tserr setenv_var TESTSUITE_GETENV toofew1 -set tserr [msg_load $module [msg_moderr {wrong # args: should be "getenv ?--return-value? variable ?valifundef?"} {getenv} $modulefile 39]] -testouterr_cmd sh "load $module" ERR $tserr +set ln [expr {[cmpversion $tclsh_version 8.5] < 1 ? {30} : {39}}] +set tserr [escre [msg_load $module [msg_moderr {wrong # args: should be "getenv ?--return-value? variable ?valifundef?"} {getenv} $modulefile $ln]]] +testouterr_cmd_re sh "load $module" ERR $tserr setenv_var TESTSUITE_GETENV toofew2 set ans [list] @@ -116,8 +119,9 @@ lappend ans [list set testsuite {}] testouterr_cmd sh "load $module" $ans {} setenv_var TESTSUITE_GETENV misplaced2 -set tserr [msg_load $module [msg_moderr {wrong # args: should be "getenv ?--return-value? variable ?valifundef?"} {getenv TEST foo --return-value} $modulefile 48]] -testouterr_cmd sh "load $module" ERR $tserr +set ln [expr {[cmpversion $tclsh_version 8.5] < 1 ? {30} : {48}}] +set tserr [escre [msg_load $module [msg_moderr {wrong # args: should be "getenv ?--return-value? variable ?valifundef?"} {getenv TEST foo --return-value} $modulefile $ln]]] +testouterr_cmd_re sh "load $module" ERR $tserr setenv_var TESTSUITE_GETENV return1 set ans [list] diff --git a/testsuite/modules.50-cmds/472-getvariant.exp b/testsuite/modules.50-cmds/472-getvariant.exp index 8a4181ad..b962a67e 100644 --- a/testsuite/modules.50-cmds/472-getvariant.exp +++ b/testsuite/modules.50-cmds/472-getvariant.exp @@ -182,38 +182,41 @@ set modulefile $mp/$module set modulefilere $mpre/$module setenv_var TESTSUITE_GETVARIANT toomany1 -set tserr [msg_load $module{foo=val1} [msg_moderr {wrong # args: should be "getvariant ?--return-value? name ?valifundef?"} {getvariant foo {} other} $modulefile 10]] -testouterr_cmd sh "load $module foo=val1" ERR $tserr +set ln [expr {[cmpversion $tclsh_version 8.5] < 1 ? {7} : {10}}] +set tserr [escre [msg_load $module{foo=val1} [msg_moderr {wrong # args: should be "getvariant ?--return-value? name ?valifundef?"} {getvariant foo {} other} $modulefile $ln]]] +testouterr_cmd_re sh "load $module foo=val1" ERR $tserr set tserr "$modlin $modulefilere: variant\\s*foo\\s*val1 val2 val3 -[escre [msg_moderr {wrong # args: should be "getvariant ?--return-value? name ?valifundef?"} {getvariant foo {} other} $modulefile 10 { }]] +[escre [msg_moderr {wrong # args: should be "getvariant ?--return-value? name ?valifundef?"} {getvariant foo {} other} $modulefile $ln { }]] $modlin" testouterr_cmd_re sh "display $module foo=val1" ERR $tserr setenv_var TESTSUITE_GETVARIANT toomany2 -set tserr [msg_load $module{foo=val1} [msg_moderr {wrong # args: should be "getvariant ?--return-value? name ?valifundef?"} {getvariant --return-value foo {} other} $modulefile 13]] -testouterr_cmd sh "load $module foo=val1" ERR $tserr +set ln [expr {[cmpversion $tclsh_version 8.5] < 1 ? {7} : {13}}] +set tserr [escre [msg_load $module{foo=val1} [msg_moderr {wrong # args: should be "getvariant ?--return-value? name ?valifundef?"} {getvariant --return-value foo {} other} $modulefile $ln]]] +testouterr_cmd_re sh "load $module foo=val1" ERR $tserr set tserr "$modlin $modulefilere: variant\\s*foo\\s*val1 val2 val3 -[escre [msg_moderr {wrong # args: should be "getvariant ?--return-value? name ?valifundef?"} {getvariant --return-value foo {} other} $modulefile 13 { }]] +[escre [msg_moderr {wrong # args: should be "getvariant ?--return-value? name ?valifundef?"} {getvariant --return-value foo {} other} $modulefile $ln { }]] $modlin" testouterr_cmd_re sh "display $module foo=val1" ERR $tserr setenv_var TESTSUITE_GETVARIANT toofew1 -set tserr [msg_load $module{foo=val1} [msg_moderr {wrong # args: should be "getvariant ?--return-value? name ?valifundef?"} {getvariant} $modulefile 16]] -testouterr_cmd sh "load $module foo=val1" ERR $tserr +set ln [expr {[cmpversion $tclsh_version 8.5] < 1 ? {7} : {16}}] +set tserr [escre [msg_load $module{foo=val1} [msg_moderr {wrong # args: should be "getvariant ?--return-value? name ?valifundef?"} {getvariant} $modulefile $ln]]] +testouterr_cmd_re sh "load $module foo=val1" ERR $tserr set tserr "$modlin $modulefilere: variant\\s*foo\\s*val1 val2 val3 -[escre [msg_moderr {wrong # args: should be "getvariant ?--return-value? name ?valifundef?"} {getvariant} $modulefile 16 { }]] +[escre [msg_moderr {wrong # args: should be "getvariant ?--return-value? name ?valifundef?"} {getvariant} $modulefile $ln { }]] $modlin" testouterr_cmd_re sh "display $module foo=val1" ERR $tserr @@ -250,14 +253,15 @@ $modlin" testouterr_cmd_re sh "display $module foo=val1" OK $tserr setenv_var TESTSUITE_GETVARIANT misplaced2 -set tserr [msg_load $module{foo=val1} [msg_moderr {wrong # args: should be "getvariant ?--return-value? name ?valifundef?"} {getvariant foo bar --return-value} $modulefile 25]] -testouterr_cmd sh "load $module foo=val1" ERR $tserr +set ln [expr {[cmpversion $tclsh_version 8.5] < 1 ? {7} : {25}}] +set tserr [escre [msg_load $module{foo=val1} [msg_moderr {wrong # args: should be "getvariant ?--return-value? name ?valifundef?"} {getvariant foo bar --return-value} $modulefile $ln]]] +testouterr_cmd_re sh "load $module foo=val1" ERR $tserr set tserr "$modlin $modulefilere: variant\\s*foo\\s*val1 val2 val3 -[escre [msg_moderr {wrong # args: should be "getvariant ?--return-value? name ?valifundef?"} {getvariant foo bar --return-value} $modulefile 25 { }]] +[escre [msg_moderr {wrong # args: should be "getvariant ?--return-value? name ?valifundef?"} {getvariant foo bar --return-value} $modulefile $ln { }]] $modlin" testouterr_cmd_re sh "display $module foo=val1" ERR $tserr