From 2af491cc4ad0ae4064f2e858c83ed485613adafa Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Fri, 16 Dec 2016 17:29:01 +0200 Subject: Convert tests/ to subproject, initial work on cross-testing support --- tests/function/builtin/buildfile | 2 +- tests/function/path/buildfile | 2 +- tests/function/path/testscript | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) (limited to 'tests/function') diff --git a/tests/function/builtin/buildfile b/tests/function/builtin/buildfile index fb06e73..a3446bb 100644 --- a/tests/function/builtin/buildfile +++ b/tests/function/builtin/buildfile @@ -2,4 +2,4 @@ # copyright : Copyright (c) 2014-2016 Code Synthesis Ltd # license : MIT; see accompanying LICENSE file -./: test{testscript} +./: test{testscript} $b diff --git a/tests/function/path/buildfile b/tests/function/path/buildfile index 65ed19b..f39a237 100644 --- a/tests/function/path/buildfile +++ b/tests/function/path/buildfile @@ -2,4 +2,4 @@ # copyright : Copyright (c) 2014-2016 Code Synthesis Ltd # license : MIT; see accompanying LICENSE file -./: test{testscript} +./: test{testscript} $b diff --git a/tests/function/path/testscript b/tests/function/path/testscript index 8467bce..828263f 100644 --- a/tests/function/path/testscript +++ b/tests/function/path/testscript @@ -32,7 +32,9 @@ s = ($cxx.target.class != windows ? '/' : '\') if ($cxx.target.class == windows) { mkdir Foo; - $* <"print \$path.normalize\('$~/foo', true)" >"$~\\Foo" + # @@ regex + #$* <'print $path.normalize($out_base/foo, true)' >~'/.+\Foo/' # cross + $* <'print $path.normalize($out_base/foo, true)' >"$~\\Foo" } } -- cgit v1.1