From a791b1ce0fa2bc9859474fb6f7a9c0ff8cbd1d4a Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Wed, 22 Feb 2017 00:58:53 +0300 Subject: Port test.sh to testscript --- .../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 | 14 --------- .../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 - 17 files changed, 182 deletions(-) delete mode 100644 tests/pkg/1/build2.org/common/libhello-1.0.0/INSTALL delete mode 100644 tests/pkg/1/build2.org/common/libhello-1.0.0/build/bootstrap.build delete mode 100644 tests/pkg/1/build2.org/common/libhello-1.0.0/build/export.build delete mode 100644 tests/pkg/1/build2.org/common/libhello-1.0.0/build/root.build delete mode 100644 tests/pkg/1/build2.org/common/libhello-1.0.0/buildfile delete mode 100644 tests/pkg/1/build2.org/common/libhello-1.0.0/hello/buildfile delete mode 100644 tests/pkg/1/build2.org/common/libhello-1.0.0/hello/export delete mode 100644 tests/pkg/1/build2.org/common/libhello-1.0.0/hello/hello delete mode 100644 tests/pkg/1/build2.org/common/libhello-1.0.0/hello/hello.cxx delete mode 100644 tests/pkg/1/build2.org/common/libhello-1.0.0/manifest delete mode 100644 tests/pkg/1/build2.org/common/libhello-1.0.0/tests/build/bootstrap.build delete mode 100644 tests/pkg/1/build2.org/common/libhello-1.0.0/tests/build/root.build delete mode 100644 tests/pkg/1/build2.org/common/libhello-1.0.0/tests/buildfile delete mode 100644 tests/pkg/1/build2.org/common/libhello-1.0.0/tests/test/buildfile delete mode 100644 tests/pkg/1/build2.org/common/libhello-1.0.0/tests/test/driver.cxx delete mode 100644 tests/pkg/1/build2.org/common/libhello-1.0.0/tests/test/test.out delete mode 100644 tests/pkg/1/build2.org/common/libhello-1.0.0/version (limited to 'tests/pkg/1/build2.org/common/libhello-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 deleted file mode 100644 index 485b10f..0000000 --- a/tests/pkg/1/build2.org/common/libhello-1.0.0/INSTALL +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 100644 index 8d8db2b..0000000 --- a/tests/pkg/1/build2.org/common/libhello-1.0.0/build/bootstrap.build +++ /dev/null @@ -1,22 +0,0 @@ -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 deleted file mode 100644 index 1eb73b7..0000000 --- a/tests/pkg/1/build2.org/common/libhello-1.0.0/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/build/root.build b/tests/pkg/1/build2.org/common/libhello-1.0.0/build/root.build deleted file mode 100644 index 4f70114..0000000 --- a/tests/pkg/1/build2.org/common/libhello-1.0.0/build/root.build +++ /dev/null @@ -1,6 +0,0 @@ -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 deleted file mode 100644 index a416648..0000000 --- a/tests/pkg/1/build2.org/common/libhello-1.0.0/buildfile +++ /dev/null @@ -1,8 +0,0 @@ -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 deleted file mode 100644 index bff7fce..0000000 --- a/tests/pkg/1/build2.org/common/libhello-1.0.0/hello/buildfile +++ /dev/null @@ -1,21 +0,0 @@ -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 deleted file mode 100644 index 18f4968..0000000 --- a/tests/pkg/1/build2.org/common/libhello-1.0.0/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/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 deleted file mode 100644 index 5fb7d9e..0000000 --- a/tests/pkg/1/build2.org/common/libhello-1.0.0/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/hello/hello.cxx b/tests/pkg/1/build2.org/common/libhello-1.0.0/hello/hello.cxx deleted file mode 100644 index 65d0aa7..0000000 --- a/tests/pkg/1/build2.org/common/libhello-1.0.0/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/manifest b/tests/pkg/1/build2.org/common/libhello-1.0.0/manifest deleted file mode 100644 index 75dc91b..0000000 --- a/tests/pkg/1/build2.org/common/libhello-1.0.0/manifest +++ /dev/null @@ -1,14 +0,0 @@ -: 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 deleted file mode 100644 index 2c2de24..0000000 --- a/tests/pkg/1/build2.org/common/libhello-1.0.0/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/tests/build/root.build b/tests/pkg/1/build2.org/common/libhello-1.0.0/tests/build/root.build deleted file mode 100644 index de723b8..0000000 --- a/tests/pkg/1/build2.org/common/libhello-1.0.0/tests/build/root.build +++ /dev/null @@ -1,14 +0,0 @@ -cxx.std = 11 - -using cxx - -hxx{*}: extension = -cxx{*}: extension = cxx - -# Every exe{} in this subproject is by default a test. -# -exe{*}: test = true - -# Specify the test target for cross-testing. -# -test.target = $cxx.target 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 deleted file mode 100644 index 4dcbe2a..0000000 --- a/tests/pkg/1/build2.org/common/libhello-1.0.0/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/tests/test/buildfile b/tests/pkg/1/build2.org/common/libhello-1.0.0/tests/test/buildfile deleted file mode 100644 index a46969d..0000000 --- a/tests/pkg/1/build2.org/common/libhello-1.0.0/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/tests/test/driver.cxx b/tests/pkg/1/build2.org/common/libhello-1.0.0/tests/test/driver.cxx deleted file mode 100644 index 59bfb2d..0000000 --- a/tests/pkg/1/build2.org/common/libhello-1.0.0/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/tests/test/test.out b/tests/pkg/1/build2.org/common/libhello-1.0.0/tests/test/test.out deleted file mode 100644 index 8ab686e..0000000 --- a/tests/pkg/1/build2.org/common/libhello-1.0.0/tests/test/test.out +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 100644 index 3eefcb9..0000000 --- a/tests/pkg/1/build2.org/common/libhello-1.0.0/version +++ /dev/null @@ -1 +0,0 @@ -1.0.0 -- cgit v1.1