Skip to content

ts: remove fixtures left behind when quick mode skips a testfile #701

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
xdelaruelle wants to merge 1 commit into
base: main
Choose a base branch
from
+6 −4
Open

ts: remove fixtures left behind when quick mode skips a testfile #701

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions testsuite/config/base-config.exp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1390,10 +1390,12 @@ proc is_quick_mode {} {
$::env(QUICKTEST)]}]
}

# if quick test mode is running stop processing of current test file
proc skip_if_quick_mode {} {
# if quick test mode is running stop processing of current test file after
# removing given fixture paths
proc skip_if_quick_mode {args} {
if {[is_quick_mode]} {
send_user "\tSkipping tests as quick test mode is enabled\n"
file delete -force {*}$args
reset_test_env
return -code 0 -level 2 0
}
Expand Down
2 changes: 1 addition & 1 deletion testsuite/modules.20-locate/180-modulepath-ignore.exp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ unsetenv_var MODULES_MODULEPATH_IGNORE
# execution
testouterr_cmd sh {--no-modulepath-ignore avail -a -t -o } OK $tserr

skip_if_quick_mode
skip_if_quick_mode $mp1

# ignore all accept some idiom with negated patterns
file mkdir $mp2/app
Expand Down
2 changes: 1 addition & 1 deletion testsuite/modules.30-cache/060-cachebuild-ignore.exp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ testouterr_cmd sh {--no-modulepath-ignore --ignore-cache is-avail bar/2.0}\

file delete $mp1cache

skip_if_quick_mode
skip_if_quick_mode $mp1

# every element is recorded in cache when modulepath_ignore is disabled
setenv_var MODULES_MODULEPATH_IGNORE 0
Expand Down