aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--build/root.build8
-rw-r--r--tests/build/.gitignore1
-rw-r--r--tests/build/bootstrap.build9
-rw-r--r--tests/build/root.build18
-rw-r--r--tests/buildfile2
-rw-r--r--tests/buildtab/buildfile7
-rw-r--r--tests/manifest/buildfile7
7 files changed, 35 insertions, 17 deletions
diff --git a/build/root.build b/build/root.build
index 196d2a3..33752ca 100644
--- a/build/root.build
+++ b/build/root.build
@@ -10,11 +10,3 @@ hxx{*}: extension = hxx
ixx{*}: extension = ixx
txx{*}: extension = txx
cxx{*}: extension = cxx
-
-# All exe{} in tests/ are, well, tests.
-#
-tests/exe{*}: test = true
-
-# Specify the test target for cross-testing.
-#
-test.target = $cxx.target
diff --git a/tests/build/.gitignore b/tests/build/.gitignore
new file mode 100644
index 0000000..225c27f
--- /dev/null
+++ b/tests/build/.gitignore
@@ -0,0 +1 @@
+config.build
diff --git a/tests/build/bootstrap.build b/tests/build/bootstrap.build
new file mode 100644
index 0000000..355a05a
--- /dev/null
+++ b/tests/build/bootstrap.build
@@ -0,0 +1,9 @@
+# file : tests/build/bootstrap.build
+# copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
+# license : MIT; see accompanying LICENSE file
+
+project = # Unnamed subproject.
+
+using config
+using dist
+using test
diff --git a/tests/build/root.build b/tests/build/root.build
new file mode 100644
index 0000000..3f39ff5
--- /dev/null
+++ b/tests/build/root.build
@@ -0,0 +1,18 @@
+# file : tests/build/root.build
+# copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
+# license : MIT; see accompanying LICENSE file
+
+cxx.std = latest
+
+using cxx
+
+hxx{*}: extension = hxx
+cxx{*}: extension = cxx
+
+# Every exe{} in this subproject is by default a test.
+#
+exe{*}: test = true
+
+# Specify the test target for cross-testing.
+#
+test.target = $cxx.target
diff --git a/tests/buildfile b/tests/buildfile
index 10e73ec..9eea969 100644
--- a/tests/buildfile
+++ b/tests/buildfile
@@ -2,4 +2,4 @@
# copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
# license : MIT; see accompanying LICENSE file
-./: */
+./: {*/ -build/}
diff --git a/tests/buildtab/buildfile b/tests/buildtab/buildfile
index 3da3faa..13a5a56 100644
--- a/tests/buildtab/buildfile
+++ b/tests/buildtab/buildfile
@@ -2,8 +2,7 @@
# copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
# license : MIT; see accompanying LICENSE file
-import libs = libbutl%lib{butl}
+import libs = libbutl%lib{butl}
+import libs += libbbot%lib{bbot}
-exe{driver}: cxx{driver} ../../libbbot/lib{bbot} $libs test{testscript}
-
-include ../../libbbot/
+exe{driver}: {hxx cxx}{*} $libs test{testscript}
diff --git a/tests/manifest/buildfile b/tests/manifest/buildfile
index 15e0b59..62b3686 100644
--- a/tests/manifest/buildfile
+++ b/tests/manifest/buildfile
@@ -2,8 +2,7 @@
# copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
# license : MIT; see accompanying LICENSE file
-import libs = libbutl%lib{butl}
+import libs = libbutl%lib{butl}
+import libs += libbbot%lib{bbot}
-exe{driver}: cxx{driver} ../../libbbot/lib{bbot} $libs test{*}
-
-include ../../libbbot/
+exe{driver}: {hxx cxx}{*} $libs test{*}