From a56c7a5d4e707e51fea407d44bd751426bfdc8f5 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Sat, 5 Dec 2020 14:16:26 +0300 Subject: Redo $normalize(true) as separate $actualize() --- tests/function/path/testscript | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) (limited to 'tests/function/path/testscript') diff --git a/tests/function/path/testscript b/tests/function/path/testscript index 52b4138..ad76513 100644 --- a/tests/function/path/testscript +++ b/tests/function/path/testscript @@ -3,7 +3,9 @@ .include ../../common.testscript -s = ($cxx.target.class != 'windows' ? '/' : '\') +posix = ($cxx.target.class != 'windows') + +s = ($posix ? '/' : '\') : canonicalize : @@ -25,16 +27,17 @@ s = ($cxx.target.class != 'windows' ? '/' : '\') $* <'print $normalize([dir_paths] a/../b a/../c/)' >"b$s c$s" : dir-paths $* <'print $path.normalize(a/../b)' >"b" : untyped $* <'print $path.normalize(a/../b/ a/../c)' >"b$s c" : mixed +} - : actualize - : - if ($cxx.target.class == 'windows') - { - mkdir Foo; - $* <'print $path.normalize($out_base/foo, true)' >~'/.+\\Foo/' - } +: actualize +: +if! $posix +{ + mkdir Foo; + $* <'print $path.actualize($out_base/foo)' >~'/.+\\Foo/' } + : directory : { @@ -103,7 +106,7 @@ s = ($cxx.target.class != 'windows' ? '/' : '\') : invalid-path : -p = ($cxx.target.class != 'windows' ? /../foo : 'c:/../foo'); +p = ($posix ? /../foo : 'c:/../foo'); $* <"\$path.normalize\('$p')" 2>>"EOE" != 0 error: invalid path: '$p' :1:2: info: while calling path.normalize\(\) -- cgit v1.1