diff --git a/testsuite/modules.51-scan/030-scan_eval-avail.exp b/testsuite/modules.51-scan/030-scan_eval-avail.exp index f1a9520fd..5a41766ed 100644 --- a/testsuite/modules.51-scan/030-scan_eval-avail.exp +++ b/testsuite/modules.51-scan/030-scan_eval-avail.exp @@ -142,7 +142,7 @@ scan/2.1{foo=val1,val2,val3}" testouterr_cmd sh {avail -t foo=val3} OK $tserr set tserr ".* -Get modules: {source/source_file foo/unk scan/foo scan/unk scan/1.0 scan/2.0 scan/1.1 scan/2.1 scan/sym} matching 'foo=val3' in '$mpre' +Get modules: {((source|scan|foo).* )*(source|scan|foo).*} matching 'foo=val3' in '$mpre' scan/1.0{foo=val1,val2,val3,val4}\\\(sym\\\) scan/1.1{foo=val1,val2,val3,val4} scan/2.0{foo=val1,val2,val3}\\\(foo\\\) @@ -188,7 +188,7 @@ testouterr_cmd sh {avail -t -o tag:variant:sym:alias scan} OK $tserr set tserr ".* Get modules: {foo/globalsym scan/globalsym foo/globalunk scan/globalunk} matching 'foo=val4' in '' .* -Get modules: {source/source_file foo/unk foo/globalunk scan/unk scan/1.0 scan/globalunk scan/1.1 scan/sym scan/globalsym} matching 'foo=val4' in '$mpre' +Get modules: {((source|scan|foo).* )*(source|scan|foo).*} matching 'foo=val4' in '$mpre' scan/1.0{foo=val1,val2,val3,val4}\\\(globalsym:sym\\\) scan/1.1{foo=val1,val2,val3,val4}" testouterr_cmd_re sh {avail -T -t foo=val4} OK $tserr diff --git a/testsuite/modules.51-scan/031-scan_eval-whatis.exp b/testsuite/modules.51-scan/031-scan_eval-whatis.exp index 319e82d95..35adf77b7 100644 --- a/testsuite/modules.51-scan/031-scan_eval-whatis.exp +++ b/testsuite/modules.51-scan/031-scan_eval-whatis.exp @@ -47,7 +47,7 @@ set tserr "$modlin $mpre $modlin testouterr_cmd_re sh {whatis foo=val3} OK $tserr set tserr ".* -Get modules: {source/source_file foo/unk scan scan/foo scan/unk scan/1.0 scan/2.0 scan/1.1 scan/2.1 scan/sym} matching 'foo=val3' in '$mpre' +Get modules: {((source|scan|foo).* )*(source|scan|foo).*} matching 'foo=val3' in '$mpre' .* $modlin $mpre $modlin \\s+scan/1.0: scan/1.0 @@ -102,7 +102,7 @@ set tserr "$modlin $mpre $modlin testouterr_cmd_re sh {whatis scan} OK $tserr set tserr ".* -Get modules: {source/source_file foo/unk foo/globalunk scan scan/unk scan/1.0 scan/globalunk scan/1.1 scan/sym scan/globalsym} matching 'foo=val4' in '$mpre' +Get modules: {((source|scan|foo).* )*(source|scan|foo).*} matching 'foo=val4' in '$mpre' .* $modlin $mpre $modlin \\s+scan/1.0: scan/1.0 diff --git a/testsuite/modules.51-scan/032-scan_eval-paths.exp b/testsuite/modules.51-scan/032-scan_eval-paths.exp index faacb613e..2f96365c5 100644 --- a/testsuite/modules.51-scan/032-scan_eval-paths.exp +++ b/testsuite/modules.51-scan/032-scan_eval-paths.exp @@ -45,7 +45,7 @@ lappend ans [list text $mp/scan/2.0] testouterr_cmd sh {paths foo=val3} $ans {} set tserr ".* -Get modules: {source/source_file foo/unk scan scan/foo scan/unk scan/1.0 scan/2.0 scan/1.1 scan/2.1 scan/sym} matching 'foo=val3' in '$mpre' +Get modules: {((source|scan|foo).* )*(source|scan|foo).*} matching 'foo=val3' in '$mpre' .*" testouterr_cmd_re sh {paths -T foo=val3} $ans $tserr @@ -85,7 +85,7 @@ lappend ans [list text $mp/scan/2.0] testouterr_cmd sh {paths scan} $ans {} set tserr ".* -Get modules: {source/source_file foo/unk foo/globalunk scan scan/unk scan/1.0 scan/globalunk scan/1.1 scan/sym scan/globalsym} matching 'foo=val4' in '$mpre' +Get modules: {((source|scan|foo).* )*(source|scan|foo).*} matching 'foo=val4' in '$mpre' .*" set ans [list] lappend ans [list text $mp/scan/1.0]