From e3663f8e727860a4e80b1873f6d3ef9c909f033a Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Thu, 4 Aug 2016 13:00:20 +0300 Subject: Update bpkg test to be able to specify C++ compiler --- .../common/hello/libhello-1.0.0+1.tar.gz | Bin 1489 -> 2145 bytes .../common/libhello-1.0.0+1/hello/buildfile | 6 +++ .../common/libhello-1.0.0+1/hello/export | 36 +++++++++++++++++ .../build2.org/common/libhello-1.0.0+1/hello/hello | 4 +- tests/test.sh | 43 +++++++++++++-------- 5 files changed, 71 insertions(+), 18 deletions(-) create mode 100644 tests/pkg/1/build2.org/common/libhello-1.0.0+1/hello/export 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 index eeff2a0..3f1a59d 100644 Binary files a/tests/pkg/1/build2.org/common/hello/libhello-1.0.0+1.tar.gz and b/tests/pkg/1/build2.org/common/hello/libhello-1.0.0+1.tar.gz differ 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 index 4903a33..40b3222 100644 --- 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 @@ -3,6 +3,12 @@ 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 new file mode 100644 index 0000000..2da8177 --- /dev/null +++ b/tests/pkg/1/build2.org/common/libhello-1.0.0+1/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/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 index 4f85114..5fb7d9e 100644 --- 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 @@ -4,8 +4,10 @@ #include +#include + namespace hello { - void + LIBHELLO_EXPORT void say (const std::string& name); } diff --git a/tests/test.sh b/tests/test.sh index 5f92c7c..e6d3033 100755 --- a/tests/test.sh +++ b/tests/test.sh @@ -15,6 +15,9 @@ # local test in order to create the repositories, then publish them (see # pkg/publish.sh), and finally run the remote test. # +# -c +# Use the compiler specified to configure cxx module. +# # --valgrind # Run under valgrind (takes forever). # @@ -54,6 +57,7 @@ fi verbose=n remote=n options= +cxx_options= while [ $# -gt 0 ]; do case $1 in @@ -69,6 +73,11 @@ while [ $# -gt 0 ]; do bpkg="valgrind -q $bpkg" shift ;; + -c) + shift + cxx_options="config.cxx=$1" + shift + ;; *) # If this is the --verbose bpkg option, switch to the verbose # mode as well. @@ -297,6 +306,7 @@ sha256sum: d09700602ff78ae405b6d4850e34660e939d27676e015a23b549884497c8bb45 EOF hello_fp=`rep_cert_fp pkg/1/build2.org/common/hello` + test rep-info -m -p --trust $hello_fp $rep/common/hello <