From 977d07a3ae47ef204665d1eda2d642e5064724f3 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Mon, 24 Jun 2019 12:01:19 +0200 Subject: Split build system into library and driver --- tests/libbuild2/buildfile | 12 ++++++++++++ tests/libbuild2/driver.cxx | 24 ++++++++++++++++++++++++ tests/libbuild2/testscript | 7 +++++++ tests/test/script/builtin/cp.testscript | 13 +++++++++++++ 4 files changed, 56 insertions(+) create mode 100644 tests/libbuild2/buildfile create mode 100644 tests/libbuild2/driver.cxx create mode 100644 tests/libbuild2/testscript (limited to 'tests') diff --git a/tests/libbuild2/buildfile b/tests/libbuild2/buildfile new file mode 100644 index 0000000..4d3a42f --- /dev/null +++ b/tests/libbuild2/buildfile @@ -0,0 +1,12 @@ +# file : tests/libbuild2/buildfile +# copyright : Copyright (c) 2014-2019 Code Synthesis Ltd +# license : MIT; see accompanying LICENSE file + +import libs = build2%lib{build2} + +exe{driver}: {hxx cxx}{*} $libs testscript + +# Setup the test driver. Note that by default we test the build2 driver (see +# build/root.build for details). +# +testscript@./: test = exe{driver} diff --git a/tests/libbuild2/driver.cxx b/tests/libbuild2/driver.cxx new file mode 100644 index 0000000..3df2fbe --- /dev/null +++ b/tests/libbuild2/driver.cxx @@ -0,0 +1,24 @@ +// file : tests/libbuild2/driver.cxx -*- C++ -*- +// copyright : Copyright (c) 2014-2019 Code Synthesis Ltd +// license : MIT; see accompanying LICENSE file + +#include +#include + +#include // sched, reset() +#include + +using namespace build2; + +int +main (int, char* argv[]) +{ + // Fake build system driver, default verbosity. + // + init_diag (1); + init (argv[0]); + sched.startup (1); // Serial execution. + reset (strings ()); // No command line variables. + + return 0; +} diff --git a/tests/libbuild2/testscript b/tests/libbuild2/testscript new file mode 100644 index 0000000..35c2c5f --- /dev/null +++ b/tests/libbuild2/testscript @@ -0,0 +1,7 @@ +# file : tests/libbuild2/testscript +# copyright : Copyright (c) 2014-2019 Code Synthesis Ltd +# license : MIT; see accompanying LICENSE file + +: basic +: +$* diff --git a/tests/test/script/builtin/cp.testscript b/tests/test/script/builtin/cp.testscript index 5f69f05..aa16465 100644 --- a/tests/test/script/builtin/cp.testscript +++ b/tests/test/script/builtin/cp.testscript @@ -358,6 +358,18 @@ if ($cxx.target.class != 'windows') EOE } + # @@ Temporary disable the test as it may fail if the package is fetched + # from the git repository location. Note that the used `ls -l` command + # displays the filesystem entry modification time with the minute + # resolution and the build2 dist meta-operation doesn't preserve the + # directory modification time. That's why the test command may + # unexpectedly succeed. + # + # One way to fix it is to instruct ls to show time with at least the + # second resolution. There is no portable way for that across different + # OSes but all of them seems to provide some option to achieve that. + # +#\ : dir : { @@ -372,5 +384,6 @@ if ($cxx.target.class != 'windows') %.+ EOE } +#\ } } -- cgit v1.1