diff options
Diffstat (limited to 'tests')
17 files changed, 16 insertions, 13 deletions
diff --git a/tests/.gitignore b/tests/.gitignore new file mode 100644 index 0000000..35ec43f --- /dev/null +++ b/tests/.gitignore @@ -0,0 +1,2 @@ +test/ +test-*/ diff --git a/tests/common/bar/stable/libbar-1.0.0.tar.gz b/tests/common/bar/stable/libbar-1.0.0.tar.gz Binary files differindex d77c1ba..7d4f9e8 100644 --- a/tests/common/bar/stable/libbar-1.0.0.tar.gz +++ b/tests/common/bar/stable/libbar-1.0.0.tar.gz diff --git a/tests/common/bar/testing/libbar-1.1.0.tar.gz b/tests/common/bar/testing/libbar-1.1.0.tar.gz Binary files differindex f081804..1dc004e 100644 --- a/tests/common/bar/testing/libbar-1.1.0.tar.gz +++ b/tests/common/bar/testing/libbar-1.1.0.tar.gz diff --git a/tests/common/bar/unstable/libbar-1.1.1.tar.gz b/tests/common/bar/unstable/libbar-1.1.1.tar.gz Binary files differindex a0fbdc3..bafd5e2 100644 --- a/tests/common/bar/unstable/libbar-1.1.1.tar.gz +++ b/tests/common/bar/unstable/libbar-1.1.1.tar.gz diff --git a/tests/common/foo/stable/libfoo-1.0.0.tar.gz b/tests/common/foo/stable/libfoo-1.0.0.tar.gz Binary files differindex c29dd9d..0aba2aa 100644 --- a/tests/common/foo/stable/libfoo-1.0.0.tar.gz +++ b/tests/common/foo/stable/libfoo-1.0.0.tar.gz diff --git a/tests/common/foo/testing/libfoo-1.1.0.tar.gz b/tests/common/foo/testing/libfoo-1.1.0.tar.gz Binary files differindex a6c0202..0e9bf9c 100644 --- a/tests/common/foo/testing/libfoo-1.1.0.tar.gz +++ b/tests/common/foo/testing/libfoo-1.1.0.tar.gz diff --git a/tests/common/hello/libhello-1.0.0.tar.gz b/tests/common/hello/libhello-1.0.0.tar.gz Binary files differindex 29341c7..c9a25d9 100644 --- a/tests/common/hello/libhello-1.0.0.tar.gz +++ b/tests/common/hello/libhello-1.0.0.tar.gz diff --git a/tests/common/libhello-1.0.0/build/export.build b/tests/common/libhello-1.0.0/build/export.build index 1eb73b7..0151425 100644 --- a/tests/common/libhello-1.0.0/build/export.build +++ b/tests/common/libhello-1.0.0/build/export.build @@ -1,6 +1,6 @@ $out_root/: { - include hello/ + include libhello/ } -export $out_root/hello/lib{hello} +export $out_root/libhello/lib{hello} diff --git a/tests/common/libhello-1.0.0/build/root.build b/tests/common/libhello-1.0.0/build/root.build index 4f70114..8ceadfa 100644 --- a/tests/common/libhello-1.0.0/build/root.build +++ b/tests/common/libhello-1.0.0/build/root.build @@ -2,5 +2,5 @@ cxx.std = 11 using cxx -hxx{*}: extension = +hxx{*}: extension = hxx cxx{*}: extension = cxx diff --git a/tests/common/libhello-1.0.0/buildfile b/tests/common/libhello-1.0.0/buildfile index 57e0f35..b3ad7e3 100644 --- a/tests/common/libhello-1.0.0/buildfile +++ b/tests/common/libhello-1.0.0/buildfile @@ -1,4 +1,4 @@ -./: hello/ tests/ doc{INSTALL version} file{manifest} +./: libhello/ tests/ doc{INSTALL version} file{manifest} doc{version}: file{manifest} # Generated by the version module. doc{version}: dist = true diff --git a/tests/common/libhello-1.0.0/hello/buildfile b/tests/common/libhello-1.0.0/libhello/buildfile index 9af86cf..f79b9e7 100644 --- a/tests/common/libhello-1.0.0/hello/buildfile +++ b/tests/common/libhello-1.0.0/libhello/buildfile @@ -16,6 +16,6 @@ lib{hello}: cxx.export.poptions = "-I$src_root" liba{hello}: cxx.export.poptions += -DLIBHELLO_STATIC libs{hello}: cxx.export.poptions += -DLIBHELLO_SHARED -# Install into the hello/ subdirectory of, say, /usr/include/. +# Install into the libhello/ subdirectory of, say, /usr/include/. # -install.include = $install.include/hello/ +install.include = $install.include/libhello/ diff --git a/tests/common/libhello-1.0.0/hello/export b/tests/common/libhello-1.0.0/libhello/export.hxx index 18f4968..e6c723e 100644 --- a/tests/common/libhello-1.0.0/hello/export +++ b/tests/common/libhello-1.0.0/libhello/export.hxx @@ -1,4 +1,4 @@ -// file: hello/export -*- C++ -*- +// file: libhello/export.hxx -*- C++ -*- #pragma once diff --git a/tests/common/libhello-1.0.0/hello/hello.cxx b/tests/common/libhello-1.0.0/libhello/hello.cxx index 65d0aa7..677815d 100644 --- a/tests/common/libhello-1.0.0/hello/hello.cxx +++ b/tests/common/libhello-1.0.0/libhello/hello.cxx @@ -1,6 +1,6 @@ -// file: hello/hello.cxx -*- C++ -*- +// file: libhello/hello.cxx -*- C++ -*- -#include <hello/hello> +#include <libhello/hello.hxx> #include <iostream> diff --git a/tests/common/libhello-1.0.0/hello/hello b/tests/common/libhello-1.0.0/libhello/hello.hxx index 5fb7d9e..58bd7b2 100644 --- a/tests/common/libhello-1.0.0/hello/hello +++ b/tests/common/libhello-1.0.0/libhello/hello.hxx @@ -1,10 +1,10 @@ -// file: hello/hello -*- C++ -*- +// file: libhello/hello.hxx -*- C++ -*- #pragma once #include <string> -#include <hello/export> +#include <libhello/export.hxx> namespace hello { diff --git a/tests/common/libhello-1.0.0/tests/.gitignore b/tests/common/libhello-1.0.0/tests/.gitignore new file mode 100644 index 0000000..93fe433 --- /dev/null +++ b/tests/common/libhello-1.0.0/tests/.gitignore @@ -0,0 +1 @@ +!test/ diff --git a/tests/common/libhello-1.0.0/tests/build/root.build b/tests/common/libhello-1.0.0/tests/build/root.build index de723b8..a2ee38a 100644 --- a/tests/common/libhello-1.0.0/tests/build/root.build +++ b/tests/common/libhello-1.0.0/tests/build/root.build @@ -2,7 +2,7 @@ cxx.std = 11 using cxx -hxx{*}: extension = +hxx{*}: extension = hxx cxx{*}: extension = cxx # Every exe{} in this subproject is by default a test. diff --git a/tests/common/libhello-1.0.0/tests/test/driver.cxx b/tests/common/libhello-1.0.0/tests/test/driver.cxx index 59bfb2d..38937f0 100644 --- a/tests/common/libhello-1.0.0/tests/test/driver.cxx +++ b/tests/common/libhello-1.0.0/tests/test/driver.cxx @@ -1,6 +1,6 @@ // file: tests/test/driver.cxx -*- C++ -*- -#include <hello/hello> +#include <libhello/hello.hxx> int main () |