From 2da5cb566e7d28f209723c43df680456d964988e Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Thu, 9 Aug 2018 18:21:41 +0200 Subject: Fix test failures on Windows --- tests/expansion/concat.test | 4 ++-- tests/name/extension.test | 27 +++++++++++++++++++++------ 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/tests/expansion/concat.test b/tests/expansion/concat.test index ba98624..baaf1e1 100644 --- a/tests/expansion/concat.test +++ b/tests/expansion/concat.test @@ -8,7 +8,7 @@ : typed-exceptions : -$* <>EOO +$* <>/EOO d = [dir_path] dir s = [string] foo @@ -16,7 +16,7 @@ print $d/{bar} print $s{bar} print $d/$s{bar} print file{x$s} -print dir/{x$s} +print $d/{x$s} print prj%{x$s} EOI dir/bar diff --git a/tests/name/extension.test b/tests/name/extension.test index c7d7066..42a0d19 100644 --- a/tests/name/extension.test +++ b/tests/name/extension.test @@ -34,15 +34,24 @@ EOI touch foo.test.txt; $* <'./: txt{foo.test...}' + # Trailing dots are not allowed on Windows. + # + : specified-escape-one : - touch foo.; - $* <'./: txt{foo..}' + if ($test.target.class != 'windows') + { + touch foo.; + $* <'./: txt{foo..}' + } : specified-escape-two : - touch foo..; - $* <'./: txt{foo....}' + if ($test.target.class != 'windows') + { + touch foo..; + $* <'./: txt{foo....}' + } : specified-invalid : @@ -64,8 +73,14 @@ EOI touch foo.test.txt; $* <'print txt{fo?.test...}' >'txt{foo.test...}' + # Trailing dots are not allowed on Windows. + # + : specified-escape : - touch foo.; - $* <'print txt{fo?..}' >'txt{foo..}' + if ($test.target.class != 'windows') + { + touch foo.; + $* <'print txt{fo?..}' >'txt{foo..}' + } } -- cgit v1.1