aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2019-08-01 16:17:09 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2019-08-01 16:41:08 +0300
commit930ae81f85e5ee5ac37311f5e9c89000fbcb59a6 (patch)
treed14c8a341f16fb6c485bfa4212bc1002fe52ed6b /tests
parentda9cbf29c403d27c2940f9b31199c4648f8ae4a1 (diff)
Move bash build system module to separate library
Diffstat (limited to 'tests')
-rw-r--r--tests/libbuild2/buildfile7
-rw-r--r--tests/libbuild2/driver.cxx4
2 files changed, 7 insertions, 4 deletions
diff --git a/tests/libbuild2/buildfile b/tests/libbuild2/buildfile
index aa6c17f..bd22b4c 100644
--- a/tests/libbuild2/buildfile
+++ b/tests/libbuild2/buildfile
@@ -2,9 +2,10 @@
# copyright : Copyright (c) 2014-2019 Code Synthesis Ltd
# license : MIT; see accompanying LICENSE file
-import libs = build2%lib{build2}
-import libs += build2%lib{build2-in}
-import libs += build2%lib{build2-version}
+import libs = build2%lib{build2}
+
+for m: bash in version
+ import libs += build2%lib{build2-$m}
exe{driver}: {hxx cxx}{*} $libs testscript
diff --git a/tests/libbuild2/driver.cxx b/tests/libbuild2/driver.cxx
index 544d43e..20c0ec2 100644
--- a/tests/libbuild2/driver.cxx
+++ b/tests/libbuild2/driver.cxx
@@ -9,6 +9,7 @@
#include <libbuild2/scheduler.hxx>
#include <libbuild2/in/init.hxx>
+#include <libbuild2/bash/init.hxx>
#include <libbuild2/version/init.hxx>
using namespace build2;
@@ -21,8 +22,9 @@ main (int, char* argv[])
init_diag (1);
init (argv[0]);
- version::build2_version_load ();
+ bash::build2_bash_load ();
in::build2_in_load ();
+ version::build2_version_load ();
sched.startup (1); // Serial execution.
reset (strings ()); // No command line variables.