From 66eea6d40b7fd2c12b297f7ce55a62e02f4db291 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Thu, 1 Dec 2016 22:26:06 +0300
Subject: Make use of casts and canonicalizations in testscripts

---
 unit-tests/test/script/parser/scope.test | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'unit-tests/test')

diff --git a/unit-tests/test/script/parser/scope.test b/unit-tests/test/script/parser/scope.test
index 44aebee..24b4a42 100644
--- a/unit-tests/test/script/parser/scope.test
+++ b/unit-tests/test/script/parser/scope.test
@@ -1,16 +1,23 @@
+# @@ REGEX Note that the script can still fail on POSIX for space-containing
+#    paths.
+#
+if ($cxx.target.class == "windows")
+  q = "'"
+end
+
 $* testscript <'cmd $@' >"cmd 1"     # id-testscript
 $* foo.test   <'cmd $@' >"cmd foo/1" # id
 
 wd = [dir_path] $~;
 wd += test-driver;
 wd += 1;
-$* testscript <'cmd "$~"' >"cmd $wd"   # wd-testscript
+$* testscript <'cmd "$~"' >"cmd $q$wd$q"   # wd-testscript
 
 wd = [dir_path] $~;
 wd += test-driver;
 wd += foo;
 wd += 1;
-$* foo.test   <'cmd "$~"' >"cmd $wd"   # wd
+$* foo.test   <'cmd "$~"' >"cmd $q$wd$q"   # wd
 
 $* -s <<EOI                          # group-empty
 {
-- 
cgit v1.1