From 134b6691cb57bb0089889faea2e4788bd450941e Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Fri, 28 Oct 2016 21:19:36 +0300 Subject: Add support for &dir/*** test path cleanup syntax --- build2/test/script/script | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) (limited to 'build2/test/script/script') diff --git a/build2/test/script/script b/build2/test/script/script index 362f0df..c3b717f 100644 --- a/build2/test/script/script +++ b/build2/test/script/script @@ -171,8 +171,23 @@ namespace build2 optional desc; // Files and directories that must be automatically cleaned up when - // the scope is left. If the path ends with a trailing slash, then it - // is assumed to be to a directory, otherwise -- to a file. + // the scope is left. If the path contains '*' it is a wildcard. If the + // path is not a wildcard and ends with a trailing slash, then it is + // assumed to be to a directory, otherwise -- to a file. A directory + // must be empty by the time of removal, + // + // The supported wildcards: + // + // dir/*** - remove directory 'dir' with all files and sub-directories + // recursively. Removing non-existing 'dir' is not an error. + // + // The not yet supported wildcards: + // + // &dir/* - remove all immediate files of directory 'dir'; + // &dir/*/ - remove all immediate sub-directories (must be empty); + // &dir/** - remove all files recursively; + // &dir/**/ - remove all sub-directories recursively (must be empty by + // the time of removal). // paths cleanups; @@ -206,10 +221,7 @@ namespace build2 // Register path for cleanup. Suppress duplicates. // void - clean (const path& p); - - void - clean (path&& p); + clean (path p); public: virtual -- cgit v1.1