From 59db6ff22d090f8b47e278e9ecbeaa049ba3ba55 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Sat, 28 Sep 2019 20:48:35 +0300 Subject: Adapt to swapping of entry and pattern parameters in butl::path_match() --- tests/function/filesystem/testscript | 38 ++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'tests/function/filesystem') diff --git a/tests/function/filesystem/testscript b/tests/function/filesystem/testscript index 5aa1d47..ecda10e 100644 --- a/tests/function/filesystem/testscript +++ b/tests/function/filesystem/testscript @@ -83,19 +83,19 @@ { : string-string : - $* <'print $path_match([string] "b*", [string] "b")' >'true' + $* <'print $path_match([string] "b", [string] "b*")' >'true' - : string-untyped + : untyped-string : - $* <'print $path_match([string] "b*", "b")' >'true' + $* <'print $path_match("b", [string] "b*")' >'true' - : untyped-string + : string-untyped : - $* <'print $path_match("b*", [string] "b")' >'true' + $* <'print $path_match([string] "b", "b*")' >'true' - : string-path + : path-string : - $* <'print $path_match([string] "b*", [path] "b")' >'true' + $* <'print $path_match([path] "b", [string] "b*")' >'true' } : path @@ -106,23 +106,23 @@ { : path-path : - $* <'print $path_match([path] "b**", [path] "a/b")' >'true' + $* <'print $path_match([path] "a/b", [path] "b**")' >'true' : path-path-untyped : - $* <'print $path_match([path] "b**", [path] "a/b", "$src_base")' >'true' + $* <'print $path_match([path] "a/b", [path] "b**", "$src_base")' >'true' - : path-untyped + : untyped-path : - $* <'print $path_match([path] "b**", "a/b")' >'true' + $* <'print $path_match("a/b", [path] "b**")' >'true' - : path-untyped-dir + : untyped-path-dir : - $* <'print $path_match([path] "b**", "a/b", $src_base)' >'true' + $* <'print $path_match("a/b", [path] "b**", $src_base)' >'true' - : untyped-path + : path-untyped : - $* <'print $path_match("b**", [path] "a/b")' >'true' + $* <'print $path_match([path] "a/b", "b**")' >'true' } : untyped @@ -132,21 +132,21 @@ { : converted-to-strings : - $* <'print $path_match("b**", "b")' >'true' + $* <'print $path_match("b", "b**")' >'true' : converted-to-paths-due-to { : pattern : - $* <'print $path_match("b**/", "a/b/")' >'true' + $* <'print $path_match("a/b/", "b**/")' >'true' : entry : - $* <'print $path_match("b**", "a/b")' >'true' + $* <'print $path_match("a/b", "b**")' >'true' : start-dir : - $* <'print $path_match("s***/", "", "$src_base")' >'true' + $* <'print $path_match("", "s***/", "$src_base")' >'true' } } } -- cgit v1.1