aboutsummaryrefslogtreecommitdiff
path: root/tests/function
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2016-12-01 13:19:49 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2016-12-01 13:19:49 +0200
commit08eea971d2d3170ca357935644483dc520f46173 (patch)
tree871df5e71e364d4620db74298b7f88f9466d1473 /tests/function
parent0ed86c76239d4f2904ea4ae1a77902a9e0db2a6d (diff)
Organize tests/, factor common testscript fragments
Diffstat (limited to 'tests/function')
-rw-r--r--tests/function/builtin/buildfile2
-rw-r--r--tests/function/builtin/testscript8
-rw-r--r--tests/function/path/buildfile2
-rw-r--r--tests/function/path/testscript8
4 files changed, 2 insertions, 18 deletions
diff --git a/tests/function/builtin/buildfile b/tests/function/builtin/buildfile
index 5a49ad0..fb06e73 100644
--- a/tests/function/builtin/buildfile
+++ b/tests/function/builtin/buildfile
@@ -3,5 +3,3 @@
# license : MIT; see accompanying LICENSE file
./: test{testscript}
-
-test{*}: test = $effect($build.path)
diff --git a/tests/function/builtin/testscript b/tests/function/builtin/testscript
index 6491a60..98513d3 100644
--- a/tests/function/builtin/testscript
+++ b/tests/function/builtin/testscript
@@ -2,13 +2,7 @@
# copyright : Copyright (c) 2014-2016 Code Synthesis Ltd
# license : MIT; see accompanying LICENSE file
-+mkdir build
-+cat <<EOI >>>build/bootstrap.build
-project = test
-amalgamation =
-EOI
-
-test.options += -q --buildfile - noop
+.include ../../common.test
: type
:
diff --git a/tests/function/path/buildfile b/tests/function/path/buildfile
index 8f51cab..65ed19b 100644
--- a/tests/function/path/buildfile
+++ b/tests/function/path/buildfile
@@ -3,5 +3,3 @@
# license : MIT; see accompanying LICENSE file
./: test{testscript}
-
-test{*}: test = $effect($build.path)
diff --git a/tests/function/path/testscript b/tests/function/path/testscript
index fc1cb31..8b527e3 100644
--- a/tests/function/path/testscript
+++ b/tests/function/path/testscript
@@ -2,13 +2,7 @@
# copyright : Copyright (c) 2014-2016 Code Synthesis Ltd
# license : MIT; see accompanying LICENSE file
-+mkdir build
-+cat <<EOI >>>build/bootstrap.build
-project = test
-amalgamation =
-EOI
-
-test.options += -q --buildfile - noop
+.include ../../common.test
+if ($cxx.target.class != windows) # @@ TMP ternarry
s = '/'