From 13e9e236ec3e0cd30bc26223430c8ff55026c08b Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Fri, 4 May 2018 15:34:34 +0200 Subject: Regenerate libprint using bdep-new --- libprint/tests/.gitignore | 7 +++++++ libprint/tests/basics/buildfile | 3 +++ libprint/tests/basics/driver.cxx | 15 +++++++++++++++ libprint/tests/build/.gitignore | 2 ++ libprint/tests/build/bootstrap.build | 4 ++-- libprint/tests/build/root.build | 6 ++++-- libprint/tests/buildfile | 2 +- libprint/tests/test/buildfile | 4 ---- libprint/tests/test/driver.cxx | 9 --------- libprint/tests/test/test.out | 1 - 10 files changed, 34 insertions(+), 19 deletions(-) create mode 100644 libprint/tests/basics/buildfile create mode 100644 libprint/tests/basics/driver.cxx delete mode 100644 libprint/tests/test/buildfile delete mode 100644 libprint/tests/test/driver.cxx delete mode 100644 libprint/tests/test/test.out (limited to 'libprint/tests') diff --git a/libprint/tests/.gitignore b/libprint/tests/.gitignore index e54525b..662178d 100644 --- a/libprint/tests/.gitignore +++ b/libprint/tests/.gitignore @@ -1 +1,8 @@ +# Test executables. +# driver + +# Testscript output directories (can be symlinks). +# +test +test-* diff --git a/libprint/tests/basics/buildfile b/libprint/tests/basics/buildfile new file mode 100644 index 0000000..337d9fa --- /dev/null +++ b/libprint/tests/basics/buildfile @@ -0,0 +1,3 @@ +import libs = libprint%lib{print} + +exe{driver}: {hxx ixx txx cxx}{*} $libs diff --git a/libprint/tests/basics/driver.cxx b/libprint/tests/basics/driver.cxx new file mode 100644 index 0000000..8252785 --- /dev/null +++ b/libprint/tests/basics/driver.cxx @@ -0,0 +1,15 @@ +#include +#include + +#include +#include + +using namespace std; +using namespace print; + +int main () +{ + ostringstream o; + print_hello (o, "Hello, World!"); + assert (o.str () == "Hello, World!\n"); +} diff --git a/libprint/tests/build/.gitignore b/libprint/tests/build/.gitignore index 225c27f..4a730a3 100644 --- a/libprint/tests/build/.gitignore +++ b/libprint/tests/build/.gitignore @@ -1 +1,3 @@ config.build +root/ +bootstrap/ diff --git a/libprint/tests/build/bootstrap.build b/libprint/tests/build/bootstrap.build index 2c2de24..a07b5ea 100644 --- a/libprint/tests/build/bootstrap.build +++ b/libprint/tests/build/bootstrap.build @@ -1,5 +1,5 @@ -project = # Unnamed subproject. +project = # Unnamed tests subproject. using config -using dist using test +using dist diff --git a/libprint/tests/build/root.build b/libprint/tests/build/root.build index a2ee38a..a67b2fe 100644 --- a/libprint/tests/build/root.build +++ b/libprint/tests/build/root.build @@ -1,14 +1,16 @@ -cxx.std = 11 +cxx.std = latest using cxx hxx{*}: extension = hxx +ixx{*}: extension = ixx +txx{*}: extension = txx cxx{*}: extension = cxx # Every exe{} in this subproject is by default a test. # exe{*}: test = true -# Specify the test target for cross-testing. +# The test target for cross-testing (running tests under Wine, etc). # test.target = $cxx.target diff --git a/libprint/tests/buildfile b/libprint/tests/buildfile index 1a8bcc9..aeeab15 100644 --- a/libprint/tests/buildfile +++ b/libprint/tests/buildfile @@ -1 +1 @@ -./: test/ +./: {*/ -build/} diff --git a/libprint/tests/test/buildfile b/libprint/tests/test/buildfile deleted file mode 100644 index ab17ea9..0000000 --- a/libprint/tests/test/buildfile +++ /dev/null @@ -1,4 +0,0 @@ -import libs = libprint%lib{print} - -exe{driver}: cxx{driver} $libs -exe{driver}: file{test.out}: test.stdout = true diff --git a/libprint/tests/test/driver.cxx b/libprint/tests/test/driver.cxx deleted file mode 100644 index 9b69a90..0000000 --- a/libprint/tests/test/driver.cxx +++ /dev/null @@ -1,9 +0,0 @@ -// file: tests/test/driver.cxx -*- C++ -*- - -#include - -int -main () -{ - print::to_stdout ("Hello, World!"); -} diff --git a/libprint/tests/test/test.out b/libprint/tests/test/test.out deleted file mode 100644 index 8ab686e..0000000 --- a/libprint/tests/test/test.out +++ /dev/null @@ -1 +0,0 @@ -Hello, World! -- cgit v1.1