From f05b71bd468bac9358d9fae169b4ca147f0e97fb Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Sun, 4 Sep 2016 15:29:53 +0200 Subject: Update libhello in tests --- .../common/hello/libhello-1.0.0+1.tar.gz | Bin 2160 -> 0 bytes .../build2.org/common/hello/libhello-1.0.0.tar.gz | Bin 0 -> 2424 bytes .../common/libhello-1.0.0+1/build/bootstrap.build | 15 ---- .../common/libhello-1.0.0+1/build/export.build | 6 -- .../common/libhello-1.0.0+1/build/root.build | 10 --- .../1/build2.org/common/libhello-1.0.0+1/buildfile | 3 - .../common/libhello-1.0.0+1/hello/buildfile | 14 ---- .../common/libhello-1.0.0+1/hello/export | 36 -------- .../build2.org/common/libhello-1.0.0+1/hello/hello | 13 --- .../common/libhello-1.0.0+1/hello/hello.cxx | 16 ---- .../1/build2.org/common/libhello-1.0.0+1/manifest | 13 --- .../libhello-1.0.0+1/tests/build/bootstrap.build | 5 -- .../common/libhello-1.0.0+1/tests/build/root.build | 10 --- .../common/libhello-1.0.0+1/tests/buildfile | 3 - .../common/libhello-1.0.0+1/tests/test/buildfile | 4 - .../common/libhello-1.0.0+1/tests/test/driver.cxx | 11 --- .../common/libhello-1.0.0+1/tests/test/test.out | 1 - .../1/build2.org/common/libhello-1.0.0+1/version | 1 - .../pkg/1/build2.org/common/libhello-1.0.0/INSTALL | 1 + .../common/libhello-1.0.0/build/bootstrap.build | 22 +++++ .../common/libhello-1.0.0/build/export.build | 6 ++ .../common/libhello-1.0.0/build/root.build | 6 ++ .../1/build2.org/common/libhello-1.0.0/buildfile | 8 ++ .../common/libhello-1.0.0/hello/buildfile | 21 +++++ .../build2.org/common/libhello-1.0.0/hello/export | 36 ++++++++ .../1/build2.org/common/libhello-1.0.0/hello/hello | 13 +++ .../common/libhello-1.0.0/hello/hello.cxx | 16 ++++ .../1/build2.org/common/libhello-1.0.0/manifest | 14 ++++ .../libhello-1.0.0/tests/build/bootstrap.build | 5 ++ .../common/libhello-1.0.0/tests/build/root.build | 10 +++ .../common/libhello-1.0.0/tests/buildfile | 3 + .../common/libhello-1.0.0/tests/test/buildfile | 4 + .../common/libhello-1.0.0/tests/test/driver.cxx | 11 +++ .../common/libhello-1.0.0/tests/test/test.out | 1 + .../pkg/1/build2.org/common/libhello-1.0.0/version | 1 + tests/test.sh | 92 ++++++++++++--------- 36 files changed, 229 insertions(+), 202 deletions(-) delete mode 100644 tests/pkg/1/build2.org/common/hello/libhello-1.0.0+1.tar.gz create mode 100644 tests/pkg/1/build2.org/common/hello/libhello-1.0.0.tar.gz delete mode 100644 tests/pkg/1/build2.org/common/libhello-1.0.0+1/build/bootstrap.build delete mode 100644 tests/pkg/1/build2.org/common/libhello-1.0.0+1/build/export.build delete mode 100644 tests/pkg/1/build2.org/common/libhello-1.0.0+1/build/root.build delete mode 100644 tests/pkg/1/build2.org/common/libhello-1.0.0+1/buildfile delete mode 100644 tests/pkg/1/build2.org/common/libhello-1.0.0+1/hello/buildfile delete mode 100644 tests/pkg/1/build2.org/common/libhello-1.0.0+1/hello/export delete mode 100644 tests/pkg/1/build2.org/common/libhello-1.0.0+1/hello/hello delete mode 100644 tests/pkg/1/build2.org/common/libhello-1.0.0+1/hello/hello.cxx delete mode 100644 tests/pkg/1/build2.org/common/libhello-1.0.0+1/manifest delete mode 100644 tests/pkg/1/build2.org/common/libhello-1.0.0+1/tests/build/bootstrap.build delete mode 100644 tests/pkg/1/build2.org/common/libhello-1.0.0+1/tests/build/root.build delete mode 100644 tests/pkg/1/build2.org/common/libhello-1.0.0+1/tests/buildfile delete mode 100644 tests/pkg/1/build2.org/common/libhello-1.0.0+1/tests/test/buildfile delete mode 100644 tests/pkg/1/build2.org/common/libhello-1.0.0+1/tests/test/driver.cxx delete mode 100644 tests/pkg/1/build2.org/common/libhello-1.0.0+1/tests/test/test.out delete mode 100644 tests/pkg/1/build2.org/common/libhello-1.0.0+1/version create mode 100644 tests/pkg/1/build2.org/common/libhello-1.0.0/INSTALL create mode 100644 tests/pkg/1/build2.org/common/libhello-1.0.0/build/bootstrap.build create mode 100644 tests/pkg/1/build2.org/common/libhello-1.0.0/build/export.build create mode 100644 tests/pkg/1/build2.org/common/libhello-1.0.0/build/root.build create mode 100644 tests/pkg/1/build2.org/common/libhello-1.0.0/buildfile create mode 100644 tests/pkg/1/build2.org/common/libhello-1.0.0/hello/buildfile create mode 100644 tests/pkg/1/build2.org/common/libhello-1.0.0/hello/export create mode 100644 tests/pkg/1/build2.org/common/libhello-1.0.0/hello/hello create mode 100644 tests/pkg/1/build2.org/common/libhello-1.0.0/hello/hello.cxx create mode 100644 tests/pkg/1/build2.org/common/libhello-1.0.0/manifest create mode 100644 tests/pkg/1/build2.org/common/libhello-1.0.0/tests/build/bootstrap.build create mode 100644 tests/pkg/1/build2.org/common/libhello-1.0.0/tests/build/root.build create mode 100644 tests/pkg/1/build2.org/common/libhello-1.0.0/tests/buildfile create mode 100644 tests/pkg/1/build2.org/common/libhello-1.0.0/tests/test/buildfile create mode 100644 tests/pkg/1/build2.org/common/libhello-1.0.0/tests/test/driver.cxx create mode 100644 tests/pkg/1/build2.org/common/libhello-1.0.0/tests/test/test.out create mode 100644 tests/pkg/1/build2.org/common/libhello-1.0.0/version diff --git a/tests/pkg/1/build2.org/common/hello/libhello-1.0.0+1.tar.gz b/tests/pkg/1/build2.org/common/hello/libhello-1.0.0+1.tar.gz deleted file mode 100644 index 5850e44..0000000 Binary files a/tests/pkg/1/build2.org/common/hello/libhello-1.0.0+1.tar.gz and /dev/null differ diff --git a/tests/pkg/1/build2.org/common/hello/libhello-1.0.0.tar.gz b/tests/pkg/1/build2.org/common/hello/libhello-1.0.0.tar.gz new file mode 100644 index 0000000..de9d167 Binary files /dev/null and b/tests/pkg/1/build2.org/common/hello/libhello-1.0.0.tar.gz differ diff --git a/tests/pkg/1/build2.org/common/libhello-1.0.0+1/build/bootstrap.build b/tests/pkg/1/build2.org/common/libhello-1.0.0+1/build/bootstrap.build deleted file mode 100644 index c9bf24d..0000000 --- a/tests/pkg/1/build2.org/common/libhello-1.0.0+1/build/bootstrap.build +++ /dev/null @@ -1,15 +0,0 @@ -project = libhello -version = 1.0.0 -revision = 1 - -using config -using dist -using test -using install - -dist.package = $project-$version - -if ($revision != 0) -{ - dist.package += +$revision -} diff --git a/tests/pkg/1/build2.org/common/libhello-1.0.0+1/build/export.build b/tests/pkg/1/build2.org/common/libhello-1.0.0+1/build/export.build deleted file mode 100644 index 1eb73b7..0000000 --- a/tests/pkg/1/build2.org/common/libhello-1.0.0+1/build/export.build +++ /dev/null @@ -1,6 +0,0 @@ -$out_root/: -{ - include hello/ -} - -export $out_root/hello/lib{hello} diff --git a/tests/pkg/1/build2.org/common/libhello-1.0.0+1/build/root.build b/tests/pkg/1/build2.org/common/libhello-1.0.0+1/build/root.build deleted file mode 100644 index d7f04c2..0000000 --- a/tests/pkg/1/build2.org/common/libhello-1.0.0+1/build/root.build +++ /dev/null @@ -1,10 +0,0 @@ -using cxx - -hxx{*}: extension = -cxx{*}: extension = cxx - -cxx.std = 11 - -# Don't install tests. -# -dir{tests/}: install = false diff --git a/tests/pkg/1/build2.org/common/libhello-1.0.0+1/buildfile b/tests/pkg/1/build2.org/common/libhello-1.0.0+1/buildfile deleted file mode 100644 index f846f89..0000000 --- a/tests/pkg/1/build2.org/common/libhello-1.0.0+1/buildfile +++ /dev/null @@ -1,3 +0,0 @@ -d = hello/ tests/ -./: $d doc{version} file{manifest} -include $d diff --git a/tests/pkg/1/build2.org/common/libhello-1.0.0+1/hello/buildfile b/tests/pkg/1/build2.org/common/libhello-1.0.0+1/hello/buildfile deleted file mode 100644 index ddd20d5..0000000 --- a/tests/pkg/1/build2.org/common/libhello-1.0.0+1/hello/buildfile +++ /dev/null @@ -1,14 +0,0 @@ -lib{hello}: {hxx cxx}{hello} - -cxx.poptions += -I$src_root -lib{hello}: cxx.export.poptions = -I$src_root - -liba{butl}: cxx.export.poptions += -DLIBHELLO_STATIC -libs{butl}: cxx.export.poptions += -DLIBHELLO_SHARED - -obja{*}: cxx.poptions += -DLIBHELLO_STATIC_BUILD -objs{*}: cxx.poptions += -DLIBHELLO_SHARED_BUILD - -# Install into the hello/ subdirectory of, say, /usr/include/. -# -install.include = $install.include/hello/ diff --git a/tests/pkg/1/build2.org/common/libhello-1.0.0+1/hello/export b/tests/pkg/1/build2.org/common/libhello-1.0.0+1/hello/export deleted file mode 100644 index 2da8177..0000000 --- a/tests/pkg/1/build2.org/common/libhello-1.0.0+1/hello/export +++ /dev/null @@ -1,36 +0,0 @@ -// file: hello/export -*- C++ -*- - -#pragma once - -// Normally we don't export class templates (but do complete specializations), -// inline functions, and classes with only inline member functions. Exporting -// classes that inherit from non-exported/import bases (e.g., std::string) -// will end up badly. The only known workarounds are to not inherit or to not -// export. Also, MinGW GCC doesn't like seeing non-exported function being -// used before their inline definition. The workaround is to reorder code. In -// the end it's all trial and error. - -#if defined(LIBHELLO_STATIC) // Using static. -# define LIBHELLO_EXPORT -#elif defined(LIBHELLO_STATIC_BUILD) // Building static. -# define LIBHELLO_EXPORT -#elif defined(LIBHELLO_SHARED) // Using shared. -# ifdef _WIN32 -# define LIBHELLO_EXPORT __declspec(dllimport) -# else -# define LIBHELLO_EXPORT -# endif -#elif defined(LIBHELLO_SHARED_BUILD) // Building shared. -# ifdef _WIN32 -# define LIBHELLO_EXPORT __declspec(dllexport) -# else -# define LIBHELLO_EXPORT -# endif -#else -// If none of the above macros are defined, then we assume we are being using -// by some third-party build system that cannot/doesn't signal the library -// type. Note that this fallback works for both static and shared but in case -// of shared will be sub-optimal compared to having dllimport. -// -# define LIBHELLO_EXPORT // Using static or shared. -#endif diff --git a/tests/pkg/1/build2.org/common/libhello-1.0.0+1/hello/hello b/tests/pkg/1/build2.org/common/libhello-1.0.0+1/hello/hello deleted file mode 100644 index 5fb7d9e..0000000 --- a/tests/pkg/1/build2.org/common/libhello-1.0.0+1/hello/hello +++ /dev/null @@ -1,13 +0,0 @@ -// file: hello/hello -*- C++ -*- - -#pragma once - -#include - -#include - -namespace hello -{ - LIBHELLO_EXPORT void - say (const std::string& name); -} diff --git a/tests/pkg/1/build2.org/common/libhello-1.0.0+1/hello/hello.cxx b/tests/pkg/1/build2.org/common/libhello-1.0.0+1/hello/hello.cxx deleted file mode 100644 index 65d0aa7..0000000 --- a/tests/pkg/1/build2.org/common/libhello-1.0.0+1/hello/hello.cxx +++ /dev/null @@ -1,16 +0,0 @@ -// file: hello/hello.cxx -*- C++ -*- - -#include - -#include - -using namespace std; - -namespace hello -{ - void - say (const string& n) - { - cout << "Hello, " << n << '!' << endl; - } -} diff --git a/tests/pkg/1/build2.org/common/libhello-1.0.0+1/manifest b/tests/pkg/1/build2.org/common/libhello-1.0.0+1/manifest deleted file mode 100644 index 82d79c8..0000000 --- a/tests/pkg/1/build2.org/common/libhello-1.0.0+1/manifest +++ /dev/null @@ -1,13 +0,0 @@ -: 1 -name: libhello -version: 1.0.0+1 -summary: The "Hello World" example library -license: MIT -tags: c++, hello, world, example -description: \ -A simple library that implements the "Hello World" example in C++. Its primary -goal is to show a canonical build2/bpkg project/package. -\ -url: http://www.example.org/libhello -email: hello-users@example.org -requires: c++11 diff --git a/tests/pkg/1/build2.org/common/libhello-1.0.0+1/tests/build/bootstrap.build b/tests/pkg/1/build2.org/common/libhello-1.0.0+1/tests/build/bootstrap.build deleted file mode 100644 index 2c2de24..0000000 --- a/tests/pkg/1/build2.org/common/libhello-1.0.0+1/tests/build/bootstrap.build +++ /dev/null @@ -1,5 +0,0 @@ -project = # Unnamed subproject. - -using config -using dist -using test diff --git a/tests/pkg/1/build2.org/common/libhello-1.0.0+1/tests/build/root.build b/tests/pkg/1/build2.org/common/libhello-1.0.0+1/tests/build/root.build deleted file mode 100644 index 672eda8..0000000 --- a/tests/pkg/1/build2.org/common/libhello-1.0.0+1/tests/build/root.build +++ /dev/null @@ -1,10 +0,0 @@ -using cxx - -hxx{*}: extension = -cxx{*}: extension = cxx - -cxx.std = 11 - -# Every exe{} in this subproject is by default a test. -# -test.exe = true diff --git a/tests/pkg/1/build2.org/common/libhello-1.0.0+1/tests/buildfile b/tests/pkg/1/build2.org/common/libhello-1.0.0+1/tests/buildfile deleted file mode 100644 index 4dcbe2a..0000000 --- a/tests/pkg/1/build2.org/common/libhello-1.0.0+1/tests/buildfile +++ /dev/null @@ -1,3 +0,0 @@ -d = test/ -./: $d -include $d diff --git a/tests/pkg/1/build2.org/common/libhello-1.0.0+1/tests/test/buildfile b/tests/pkg/1/build2.org/common/libhello-1.0.0+1/tests/test/buildfile deleted file mode 100644 index a46969d..0000000 --- a/tests/pkg/1/build2.org/common/libhello-1.0.0+1/tests/test/buildfile +++ /dev/null @@ -1,4 +0,0 @@ -import libs = libhello%lib{hello} - -exe{driver}: cxx{driver} $libs -exe{driver}: test.output = test.out diff --git a/tests/pkg/1/build2.org/common/libhello-1.0.0+1/tests/test/driver.cxx b/tests/pkg/1/build2.org/common/libhello-1.0.0+1/tests/test/driver.cxx deleted file mode 100644 index 59bfb2d..0000000 --- a/tests/pkg/1/build2.org/common/libhello-1.0.0+1/tests/test/driver.cxx +++ /dev/null @@ -1,11 +0,0 @@ -// file: tests/test/driver.cxx -*- C++ -*- - -#include - -int -main () -{ - using hello::say; - - say ("World"); -} diff --git a/tests/pkg/1/build2.org/common/libhello-1.0.0+1/tests/test/test.out b/tests/pkg/1/build2.org/common/libhello-1.0.0+1/tests/test/test.out deleted file mode 100644 index 8ab686e..0000000 --- a/tests/pkg/1/build2.org/common/libhello-1.0.0+1/tests/test/test.out +++ /dev/null @@ -1 +0,0 @@ -Hello, World! diff --git a/tests/pkg/1/build2.org/common/libhello-1.0.0+1/version b/tests/pkg/1/build2.org/common/libhello-1.0.0+1/version deleted file mode 100644 index 3eefcb9..0000000 --- a/tests/pkg/1/build2.org/common/libhello-1.0.0+1/version +++ /dev/null @@ -1 +0,0 @@ -1.0.0 diff --git a/tests/pkg/1/build2.org/common/libhello-1.0.0/INSTALL b/tests/pkg/1/build2.org/common/libhello-1.0.0/INSTALL new file mode 100644 index 0000000..485b10f --- /dev/null +++ b/tests/pkg/1/build2.org/common/libhello-1.0.0/INSTALL @@ -0,0 +1 @@ +Just use build2, bro. diff --git a/tests/pkg/1/build2.org/common/libhello-1.0.0/build/bootstrap.build b/tests/pkg/1/build2.org/common/libhello-1.0.0/build/bootstrap.build new file mode 100644 index 0000000..8d8db2b --- /dev/null +++ b/tests/pkg/1/build2.org/common/libhello-1.0.0/build/bootstrap.build @@ -0,0 +1,22 @@ +project = libhello + +using build@0.4.0-a1 + +version = 1.0.0 + +abi_major = 1 +abi_minor = 0 +abi_patch = 0 +abi_prerelease = false + +revision = 0 + +dist.package = $project-$version + +if ($revision != 0) + dist.package += +$revision + +using config +using dist +using test +using install diff --git a/tests/pkg/1/build2.org/common/libhello-1.0.0/build/export.build b/tests/pkg/1/build2.org/common/libhello-1.0.0/build/export.build new file mode 100644 index 0000000..1eb73b7 --- /dev/null +++ b/tests/pkg/1/build2.org/common/libhello-1.0.0/build/export.build @@ -0,0 +1,6 @@ +$out_root/: +{ + include hello/ +} + +export $out_root/hello/lib{hello} diff --git a/tests/pkg/1/build2.org/common/libhello-1.0.0/build/root.build b/tests/pkg/1/build2.org/common/libhello-1.0.0/build/root.build new file mode 100644 index 0000000..4f70114 --- /dev/null +++ b/tests/pkg/1/build2.org/common/libhello-1.0.0/build/root.build @@ -0,0 +1,6 @@ +cxx.std = 11 + +using cxx + +hxx{*}: extension = +cxx{*}: extension = cxx diff --git a/tests/pkg/1/build2.org/common/libhello-1.0.0/buildfile b/tests/pkg/1/build2.org/common/libhello-1.0.0/buildfile new file mode 100644 index 0000000..a416648 --- /dev/null +++ b/tests/pkg/1/build2.org/common/libhello-1.0.0/buildfile @@ -0,0 +1,8 @@ +d = hello/ tests/ +./: $d doc{INSTALL version} file{manifest} +include $d + +# Don't install tests or the INSTALL file. +# +dir{tests/}: install = false +doc{INSTALL}@./: install = false diff --git a/tests/pkg/1/build2.org/common/libhello-1.0.0/hello/buildfile b/tests/pkg/1/build2.org/common/libhello-1.0.0/hello/buildfile new file mode 100644 index 0000000..8331a7b --- /dev/null +++ b/tests/pkg/1/build2.org/common/libhello-1.0.0/hello/buildfile @@ -0,0 +1,21 @@ +lib{hello}: {hxx cxx}{hello} hxx{export} + +# For pre-releases use the complete version to make sure they cannot be used +# in place of another pre-release or the final version. +# +if $abi_prerelease + lib{hello}: bin.lib.version = @-$version +else + lib{hello}: bin.lib.version = @-$abi_major.$abi_minor + +cxx.poptions += -I$src_root +obja{*}: cxx.poptions += -DLIBHELLO_STATIC_BUILD +objs{*}: cxx.poptions += -DLIBHELLO_SHARED_BUILD + +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.include = $install.include/hello/ diff --git a/tests/pkg/1/build2.org/common/libhello-1.0.0/hello/export b/tests/pkg/1/build2.org/common/libhello-1.0.0/hello/export new file mode 100644 index 0000000..18f4968 --- /dev/null +++ b/tests/pkg/1/build2.org/common/libhello-1.0.0/hello/export @@ -0,0 +1,36 @@ +// file: hello/export -*- C++ -*- + +#pragma once + +// Normally we don't export class templates (but do complete specializations), +// inline functions, and classes with only inline member functions. Exporting +// classes that inherit from non-exported/imported bases (e.g., std::string) +// will end up badly. The only known workarounds are to not inherit or to not +// export. Also, MinGW GCC doesn't like seeing non-exported function being +// used before their inline definition. The workaround is to reorder code. In +// the end it's all trial and error. + +#if defined(LIBHELLO_STATIC) // Using static. +# define LIBHELLO_EXPORT +#elif defined(LIBHELLO_STATIC_BUILD) // Building static. +# define LIBHELLO_EXPORT +#elif defined(LIBHELLO_SHARED) // Using shared. +# ifdef _WIN32 +# define LIBHELLO_EXPORT __declspec(dllimport) +# else +# define LIBHELLO_EXPORT +# endif +#elif defined(LIBHELLO_SHARED_BUILD) // Building shared. +# ifdef _WIN32 +# define LIBHELLO_EXPORT __declspec(dllexport) +# else +# define LIBHELLO_EXPORT +# endif +#else +// If none of the above macros are defined, then we assume we are being used +// by some third-party build system that cannot/doesn't signal the library +// type. Note that this fallback works for both static and shared but in case +// of shared will be sub-optimal compared to having dllimport. +// +# define LIBHELLO_EXPORT // Using static or shared. +#endif diff --git a/tests/pkg/1/build2.org/common/libhello-1.0.0/hello/hello b/tests/pkg/1/build2.org/common/libhello-1.0.0/hello/hello new file mode 100644 index 0000000..5fb7d9e --- /dev/null +++ b/tests/pkg/1/build2.org/common/libhello-1.0.0/hello/hello @@ -0,0 +1,13 @@ +// file: hello/hello -*- C++ -*- + +#pragma once + +#include + +#include + +namespace hello +{ + LIBHELLO_EXPORT void + say (const std::string& name); +} diff --git a/tests/pkg/1/build2.org/common/libhello-1.0.0/hello/hello.cxx b/tests/pkg/1/build2.org/common/libhello-1.0.0/hello/hello.cxx new file mode 100644 index 0000000..65d0aa7 --- /dev/null +++ b/tests/pkg/1/build2.org/common/libhello-1.0.0/hello/hello.cxx @@ -0,0 +1,16 @@ +// file: hello/hello.cxx -*- C++ -*- + +#include + +#include + +using namespace std; + +namespace hello +{ + void + say (const string& n) + { + cout << "Hello, " << n << '!' << endl; + } +} diff --git a/tests/pkg/1/build2.org/common/libhello-1.0.0/manifest b/tests/pkg/1/build2.org/common/libhello-1.0.0/manifest new file mode 100644 index 0000000..75dc91b --- /dev/null +++ b/tests/pkg/1/build2.org/common/libhello-1.0.0/manifest @@ -0,0 +1,14 @@ +: 1 +name: libhello +version: 1.0.0 +summary: The "Hello World" example library +license: MIT +tags: c++, hello, world, example +description: \ +A simple library that implements the "Hello World" example in C++. Its primary +goal is to show a canonical build2/bpkg project/package. +\ +url: http://www.example.org/libhello +email: hello-users@example.org +requires: c++11 +requires: build2 >= 0.4.0 diff --git a/tests/pkg/1/build2.org/common/libhello-1.0.0/tests/build/bootstrap.build b/tests/pkg/1/build2.org/common/libhello-1.0.0/tests/build/bootstrap.build new file mode 100644 index 0000000..2c2de24 --- /dev/null +++ b/tests/pkg/1/build2.org/common/libhello-1.0.0/tests/build/bootstrap.build @@ -0,0 +1,5 @@ +project = # Unnamed subproject. + +using config +using dist +using test diff --git a/tests/pkg/1/build2.org/common/libhello-1.0.0/tests/build/root.build b/tests/pkg/1/build2.org/common/libhello-1.0.0/tests/build/root.build new file mode 100644 index 0000000..1f7c350 --- /dev/null +++ b/tests/pkg/1/build2.org/common/libhello-1.0.0/tests/build/root.build @@ -0,0 +1,10 @@ +cxx.std = 11 + +using cxx + +hxx{*}: extension = +cxx{*}: extension = cxx + +# Every exe{} in this subproject is by default a test. +# +exe{*}: test = true diff --git a/tests/pkg/1/build2.org/common/libhello-1.0.0/tests/buildfile b/tests/pkg/1/build2.org/common/libhello-1.0.0/tests/buildfile new file mode 100644 index 0000000..4dcbe2a --- /dev/null +++ b/tests/pkg/1/build2.org/common/libhello-1.0.0/tests/buildfile @@ -0,0 +1,3 @@ +d = test/ +./: $d +include $d diff --git a/tests/pkg/1/build2.org/common/libhello-1.0.0/tests/test/buildfile b/tests/pkg/1/build2.org/common/libhello-1.0.0/tests/test/buildfile new file mode 100644 index 0000000..a46969d --- /dev/null +++ b/tests/pkg/1/build2.org/common/libhello-1.0.0/tests/test/buildfile @@ -0,0 +1,4 @@ +import libs = libhello%lib{hello} + +exe{driver}: cxx{driver} $libs +exe{driver}: test.output = test.out diff --git a/tests/pkg/1/build2.org/common/libhello-1.0.0/tests/test/driver.cxx b/tests/pkg/1/build2.org/common/libhello-1.0.0/tests/test/driver.cxx new file mode 100644 index 0000000..59bfb2d --- /dev/null +++ b/tests/pkg/1/build2.org/common/libhello-1.0.0/tests/test/driver.cxx @@ -0,0 +1,11 @@ +// file: tests/test/driver.cxx -*- C++ -*- + +#include + +int +main () +{ + using hello::say; + + say ("World"); +} diff --git a/tests/pkg/1/build2.org/common/libhello-1.0.0/tests/test/test.out b/tests/pkg/1/build2.org/common/libhello-1.0.0/tests/test/test.out new file mode 100644 index 0000000..8ab686e --- /dev/null +++ b/tests/pkg/1/build2.org/common/libhello-1.0.0/tests/test/test.out @@ -0,0 +1 @@ +Hello, World! diff --git a/tests/pkg/1/build2.org/common/libhello-1.0.0/version b/tests/pkg/1/build2.org/common/libhello-1.0.0/version new file mode 100644 index 0000000..3eefcb9 --- /dev/null +++ b/tests/pkg/1/build2.org/common/libhello-1.0.0/version @@ -0,0 +1 @@ +1.0.0 diff --git a/tests/test.sh b/tests/test.sh index 85fde8e..7b2fdf2 100755 --- a/tests/test.sh +++ b/tests/test.sh @@ -234,7 +234,7 @@ fail pkg-verify # archive expected fail pkg-verify ./no-such-file # archive does not exist fail pkg-verify pkg/1/build2.org/common/not-a-package.tar.gz fail pkg-verify --silent pkg/1/build2.org/common/not-a-package.tar.gz -test pkg-verify pkg/1/build2.org/common/hello/libhello-1.0.0+1.tar.gz +test pkg-verify pkg/1/build2.org/common/hello/libhello-1.0.0.tar.gz ## @@ -261,6 +261,7 @@ fail rep-info # repository location expected test rep-info --trust-yes $rep/common/foo/testing <= 0.4.0 +location: libhello-1.0.0.tar.gz +sha256sum: 4d3f26addc718eb186192edc50b0c60b4eda3da92ebb4537b3f187206a260f12 EOF ## @@ -434,7 +436,7 @@ test pkg-purge libfoo test cfg-create --wipe test rep-add $rep/common/hello test rep-fetch --trust $hello_fp -test pkg-fetch libhello/1.0.0+1 +test pkg-fetch libhello/1.0.0 test pkg-purge libhello @@ -491,7 +493,7 @@ test pkg-purge libfoo test cfg-create --wipe test rep-add $rep/common/hello test rep-fetch --trust $hello_fp -test pkg-fetch libhello/1.0.0+1 +test pkg-fetch libhello/1.0.0 test pkg-unpack libhello test pkg-purge libhello @@ -607,7 +609,7 @@ fail pkg-configure libhello1 # no such package fail pkg-disfigure # package name expected fail pkg-disfigure libhello1 # no such package -test pkg-fetch libhello/1.0.0+1 +test pkg-fetch libhello/1.0.0 fail pkg-configure libhello $cxx_options # wrong package state fail pkg-disfigure libhello # wrong package state @@ -616,47 +618,47 @@ test pkg-purge libhello # src == out # -test pkg-fetch libhello/1.0.0+1 +test pkg-fetch libhello/1.0.0 test pkg-unpack libhello test pkg-configure libhello $cxx_options -stat libhello "configured 1.0.0+1; available sys:?" +stat libhello "configured 1.0.0; available sys:?" test pkg-disfigure libhello -stat libhello "unpacked 1.0.0+1; available sys:?" +stat libhello "unpacked 1.0.0; available sys:?" test pkg-purge libhello -stat libhello/1.0.0 "available 1.0.0+1" +stat libhello/1.0.0 "available" # src != out # test cfg-create --wipe -test pkg-unpack -e pkg/1/build2.org/common/libhello-1.0.0+1 +test pkg-unpack -e pkg/1/build2.org/common/libhello-1.0.0 test pkg-configure libhello $cxx_options -stat libhello "configured 1.0.0+1" +stat libhello "configured 1.0.0" test pkg-disfigure libhello -stat libhello "unpacked 1.0.0+1" +stat libhello "unpacked 1.0.0" test pkg-purge libhello stat libhello unknown -gone $cfg/libhello-1.0.0+1 +gone $cfg/libhello-1.0.0 # out still exists after disfigure # -test pkg-unpack -e pkg/1/build2.org/common/libhello-1.0.0+1 +test pkg-unpack -e pkg/1/build2.org/common/libhello-1.0.0 test pkg-configure libhello $cxx_options -touch $cfg/libhello-1.0.0+1/stray +touch $cfg/libhello-1.0.0/stray fail pkg-disfigure libhello -stat libhello/1.0.0+1 broken -rm -r $cfg/libhello-1.0.0+1 +stat libhello/1.0.0 broken +rm -r $cfg/libhello-1.0.0 test pkg-purge -f libhello stat libhello unknown # disfigure failed # -test pkg-unpack -e pkg/1/build2.org/common/libhello-1.0.0+1 +test pkg-unpack -e pkg/1/build2.org/common/libhello-1.0.0 test pkg-configure libhello $cxx_options -chmod 555 $cfg/libhello-1.0.0+1 +chmod 555 $cfg/libhello-1.0.0 fail pkg-disfigure libhello -stat libhello/1.0.0+1 broken -chmod 755 $cfg/libhello-1.0.0+1 -rm -r $cfg/libhello-1.0.0+1 +stat libhello/1.0.0 broken +chmod 755 $cfg/libhello-1.0.0 +rm -r $cfg/libhello-1.0.0 test pkg-purge -f libhello stat libhello unknown @@ -668,25 +670,25 @@ stat libhello unknown if [ "$msys" != "y" ]; then # configure failed but disfigure succeeds # - test pkg-unpack -e pkg/1/build2.org/common/libhello-1.0.0+1 - mkdir -p $cfg/libhello-1.0.0+1/build - chmod 555 $cfg/libhello-1.0.0+1/build + test pkg-unpack -e pkg/1/build2.org/common/libhello-1.0.0 + mkdir -p $cfg/libhello-1.0.0/build + chmod 555 $cfg/libhello-1.0.0/build fail pkg-configure libhello $cxx_options - stat libhello "unpacked 1.0.0+1" + stat libhello "unpacked 1.0.0" test pkg-purge libhello stat libhello unknown # configure and disfigure both failed # - test pkg-unpack -e pkg/1/build2.org/common/libhello-1.0.0+1 - mkdir -p $cfg/libhello-1.0.0+1/build + test pkg-unpack -e pkg/1/build2.org/common/libhello-1.0.0 + mkdir -p $cfg/libhello-1.0.0/build # Trip both con/dis. # - chmod 555 $cfg/libhello-1.0.0+1 $cfg/libhello-1.0.0+1/build + chmod 555 $cfg/libhello-1.0.0 $cfg/libhello-1.0.0/build fail pkg-configure libhello $cxx_options - stat libhello/1.0.0+1 broken - chmod 755 $cfg/libhello-1.0.0+1 $cfg/libhello-1.0.0+1/build - rm -r $cfg/libhello-1.0.0+1 + stat libhello/1.0.0 broken + chmod 755 $cfg/libhello-1.0.0 $cfg/libhello-1.0.0/build + rm -r $cfg/libhello-1.0.0 test pkg-purge -f libhello stat libhello unknown fi @@ -815,13 +817,13 @@ test rep-fetch --trust $hello_fp fail pkg-update # package name expected fail pkg-update libhello # no such package -test pkg-fetch libhello/1.0.0+1 +test pkg-fetch libhello/1.0.0 fail pkg-update libhello # wrong package state test pkg-purge libhello # src == out # -test pkg-fetch libhello/1.0.0+1 +test pkg-fetch libhello/1.0.0 test pkg-unpack libhello test pkg-configure libhello $cxx_options test pkg-update libhello @@ -832,7 +834,7 @@ test pkg-purge libhello # src != out # test cfg-create --wipe -test pkg-unpack -e pkg/1/build2.org/common/libhello-1.0.0+1 +test pkg-unpack -e pkg/1/build2.org/common/libhello-1.0.0 test pkg-configure libhello $cxx_options test pkg-update libhello test pkg-update libhello @@ -849,13 +851,13 @@ test rep-fetch --trust $hello_fp fail pkg-clean # package name expected fail pkg-clean libhello # no such package -test pkg-fetch libhello/1.0.0+1 +test pkg-fetch libhello/1.0.0 fail pkg-clean libhello # wrong package state test pkg-purge libhello # src == out # -test pkg-fetch libhello/1.0.0+1 +test pkg-fetch libhello/1.0.0 test pkg-unpack libhello test pkg-configure libhello $cxx_options test pkg-update libhello @@ -867,7 +869,7 @@ test pkg-purge libhello # src != out # test cfg-create --wipe -test pkg-unpack -e pkg/1/build2.org/common/libhello-1.0.0+1 +test pkg-unpack -e pkg/1/build2.org/common/libhello-1.0.0 test pkg-configure libhello $cxx_options test pkg-update libhello test pkg-clean libhello @@ -886,7 +888,7 @@ test pkg-purge libhello test cfg-create --wipe cxx $cxx_options test rep-add $rep/common/hello test rep-fetch --trust $hello_fp -test pkg-fetch libhello/1.0.0+1 +test pkg-fetch libhello/1.0.0 test pkg-unpack libhello test pkg-configure libhello $cxx_options test pkg-update libhello @@ -1588,6 +1590,7 @@ test rep-info --trust-no --trust $signed_fp -d $cfg $rep/auth/signed <