diff --git a/src/bootsupport/modules/punk/tcltestrun-0.3.0.tm b/src/bootsupport/modules/punk/tcltestrun-0.3.1.tm similarity index 99% rename from src/bootsupport/modules/punk/tcltestrun-0.3.0.tm rename to src/bootsupport/modules/punk/tcltestrun-0.3.1.tm index ff020161..78d899c0 100644 --- a/src/bootsupport/modules/punk/tcltestrun-0.3.0.tm +++ b/src/bootsupport/modules/punk/tcltestrun-0.3.1.tm @@ -8,7 +8,7 @@ # (C) 2026 # # @@ Meta Begin -# Application punk::tcltestrun 0.3.0 +# Application punk::tcltestrun 0.3.1 # Meta platform tcl # Meta license BSD # @@ Meta End @@ -373,8 +373,8 @@ tcl::namespace::eval punk::tcltestrun { #when running against unbuilt modules - we want to ensure that the unbuilt versions of any modules are used rather than any installed versions - so we add package ifneeded definitions for the unbuilt versions of any modules that are present. # add 'package ifneeded' definitions for unbuilt #modpod modules. #first gather subdirectories of modules that contain #modpod-*- in their name - these should be the unbuilt versions of zip based modules. - #'punk::path::subfolders' currently only supports negative matching with -exclude, so we have to filter for the positive match ourselves. - set subfolders [punk::path::subfolders -recursive -exclude {**/_build/** **/_build} $tmpath] + #'punk::path::subfolders' currently only supports negative matching with -exclude-paths, so we have to filter for the positive match ourselves. + set subfolders [punk::path::subfolders -recursive -exclude-paths {**/_build/*** **/_mint/***} $tmpath] set script "" foreach sub $subfolders { #In most cases we could use string match - but the * within modpod-*- could match a forward slash which could then match some other file under a #modpod- folder structure, @@ -543,7 +543,7 @@ namespace eval ::punk::args::register { package provide punk::tcltestrun [tcl::namespace::eval punk::tcltestrun { variable pkg punk::tcltestrun variable version - set version 0.3.0 + set version 0.3.1 }] return diff --git a/src/vfs/_vfscommon.vfs/modules/punk/tcltestrun-0.3.0.tm b/src/vfs/_vfscommon.vfs/modules/punk/tcltestrun-0.3.1.tm similarity index 99% rename from src/vfs/_vfscommon.vfs/modules/punk/tcltestrun-0.3.0.tm rename to src/vfs/_vfscommon.vfs/modules/punk/tcltestrun-0.3.1.tm index ff020161..78d899c0 100644 --- a/src/vfs/_vfscommon.vfs/modules/punk/tcltestrun-0.3.0.tm +++ b/src/vfs/_vfscommon.vfs/modules/punk/tcltestrun-0.3.1.tm @@ -8,7 +8,7 @@ # (C) 2026 # # @@ Meta Begin -# Application punk::tcltestrun 0.3.0 +# Application punk::tcltestrun 0.3.1 # Meta platform tcl # Meta license BSD # @@ Meta End @@ -373,8 +373,8 @@ tcl::namespace::eval punk::tcltestrun { #when running against unbuilt modules - we want to ensure that the unbuilt versions of any modules are used rather than any installed versions - so we add package ifneeded definitions for the unbuilt versions of any modules that are present. # add 'package ifneeded' definitions for unbuilt #modpod modules. #first gather subdirectories of modules that contain #modpod-*- in their name - these should be the unbuilt versions of zip based modules. - #'punk::path::subfolders' currently only supports negative matching with -exclude, so we have to filter for the positive match ourselves. - set subfolders [punk::path::subfolders -recursive -exclude {**/_build/** **/_build} $tmpath] + #'punk::path::subfolders' currently only supports negative matching with -exclude-paths, so we have to filter for the positive match ourselves. + set subfolders [punk::path::subfolders -recursive -exclude-paths {**/_build/*** **/_mint/***} $tmpath] set script "" foreach sub $subfolders { #In most cases we could use string match - but the * within modpod-*- could match a forward slash which could then match some other file under a #modpod- folder structure, @@ -543,7 +543,7 @@ namespace eval ::punk::args::register { package provide punk::tcltestrun [tcl::namespace::eval punk::tcltestrun { variable pkg punk::tcltestrun variable version - set version 0.3.0 + set version 0.3.1 }] return diff --git a/src/vfs/_vfscommon.vfs/modules/test/runtestmodules.tcl b/src/vfs/_vfscommon.vfs/modules/test/runtestmodules.tcl index 47ee5d7c..ca1eb855 100644 --- a/src/vfs/_vfscommon.vfs/modules/test/runtestmodules.tcl +++ b/src/vfs/_vfscommon.vfs/modules/test/runtestmodules.tcl @@ -41,8 +41,8 @@ if {$test_type eq "unbuilt"} { # add 'package ifneeded' definitions for unbuilt #modpod modules. #first gather subdirectories of modules that contain #modpod-*-999999.0a1.0 in their name - these should be the unbuilt versions of zip based modules. #set subfolders [punk::path::subfolders -recursive [file normalize $project_root/src/modules] -match */#modpod-*-999999.0a1.0] - #'punk::path::subfolders' currently only supports negative matching with -exclude, so we have to filter for the positive match ourselves. - set subfolders [punk::path::subfolders -recursive -exclude {**/_build/** **/_build} [file normalize $project_root/src/modules]] + #'punk::path::subfolders' currently only supports negative matching with -exclude-paths, so we have to filter for the positive match ourselves. + set subfolders [punk::path::subfolders -recursive -exclude-paths {**/_build/*** **/_mint/***} [file normalize $project_root/src/modules]] foreach sub $subfolders { #In most cases we could use string match - but the * within modpod-*-999999.0a1.0 could match a forward slash which could then match some other file under a #modpod- folder structure, #so we use globmatchpath which treats * as matching any characters except path separators.