Skip to content

Commit

Permalink
ts: make traced scan tests more robust to file change
Browse files Browse the repository at this point in the history
  • Loading branch information
xdelaruelle committed Apr 17, 2024
1 parent 820c788 commit 474139d
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions testsuite/modules.51-scan/030-scan_eval-avail.exp
Expand Up @@ -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\\\)
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions testsuite/modules.51-scan/031-scan_eval-whatis.exp
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions testsuite/modules.51-scan/032-scan_eval-paths.exp
Expand Up @@ -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

Expand Down Expand Up @@ -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]
Expand Down

0 comments on commit 474139d

Please sign in to comment.