From e1c5a89560ada33ee4203e1d791fc610e3f87c4345c4b71565bb45391b7411fb Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Fri, 21 Apr 2017 12:48:16 +0000 Subject: [PATCH] Accepting request 489639 from home:adamm:branches:devel:libraries:c_c++ - New upstream version 1.64.0 + process - new library providing cross platform methods to - create child processes - setup stream for child processes - sync and async communication streams with children - sync and async wait - process termination + geometry library had some breaking changes, - ublas_transformer is renamed to matrix_transformer - explicit modifier is added to constructors of rtree index::dynamic_* parameters - strategy::area::huiller replaced by strategy::area::spherical + context library updates - deprecated API:execution-context - fixed bad assembly for fcontext on ppc64/sysv/elf + Updated libraries: any, atomic, config, container, context, conversion, core, coroutine2, fiber, hash, interprocess, intrusive, lexicalcast, math, multi-index containers, multiprecision, predef, program options, regex, smart pointers, test ,typeindex, typetraits, unordered, variant + for details, see http://www.boost.org/users/history/version_1_64_0.html - Build PyNumpy module + add build requires on python-numpy - test_lowcase.patch: upstreamed - refreshed patches: boost-strict_aliasing.patch, gcc_path.patch, python_mpi.patch - mpi_upstream.patch: pending upstream fixes to OpenMPI build - python_library_name.patch: we are building python versions in different stagings so drop library renames. OBS-URL: https://build.opensuse.org/request/show/489639 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/boost?expand=0&rev=194 --- baselibs.conf | 52 +- boost-strict_aliasing.patch | 6 +- boost.changes | 35 ++ boost.spec | 103 +++- boost_1_63_0.tar.bz2 | 3 - boost_1_64_0.tar.bz2 | 3 + gcc_path.patch | 6 +- mpi_upstream.patch | 178 ++++++ python_library_name.patch | 94 ++++ python_mpi.patch | 6 +- python_numpy_retfunc.patch | 22 + test_lowcase.patch | 1058 ----------------------------------- 12 files changed, 457 insertions(+), 1109 deletions(-) delete mode 100644 boost_1_63_0.tar.bz2 create mode 100644 boost_1_64_0.tar.bz2 create mode 100644 mpi_upstream.patch create mode 100644 python_library_name.patch create mode 100644 python_numpy_retfunc.patch delete mode 100644 test_lowcase.patch diff --git a/baselibs.conf b/baselibs.conf index be56cc6..ed0f59f 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,27 +1,27 @@ -boost_1_63-devel +boost_1_64-devel requires -boost- -libboost_atomic1_63_0 -libboost_container1_63_0 -libboost_context1_63_0 -libboost_coroutine1_63_0 -libboost_date_time1_63_0 -libboost_fiber1_63_0 -libboost_filesystem1_63_0 -libboost_graph1_63_0 -libboost_graph_parallel1_63_0 -libboost_iostreams1_63_0 -libboost_locale1_63_0 -libboost_math1_63_0 -libboost_mpi1_63_0 -libboost_test1_63_0 -libboost_program_options1_63_0 -libboost_python-py2_7-1_63_0 -libboost_python-py3-1_63_0 -libboost_random1_63_0 -libboost_serialization1_63_0 -libboost_signals1_63_0 -libboost_system1_63_0 -libboost_thread1_63_0 -libboost_type_erasure1_63_0 -libboost_wave1_63_0 -libboost_regex1_63_0 +libboost_atomic1_64_0 +libboost_container1_64_0 +libboost_context1_64_0 +libboost_coroutine1_64_0 +libboost_date_time1_64_0 +libboost_fiber1_64_0 +libboost_filesystem1_64_0 +libboost_graph1_64_0 +libboost_graph_parallel1_64_0 +libboost_iostreams1_64_0 +libboost_locale1_64_0 +libboost_math1_64_0 +libboost_mpi1_64_0 +libboost_test1_64_0 +libboost_program_options1_64_0 +libboost_python-py2_7-1_64_0 +libboost_python-py3-1_64_0 +libboost_random1_64_0 +libboost_serialization1_64_0 +libboost_signals1_64_0 +libboost_system1_64_0 +libboost_thread1_64_0 +libboost_type_erasure1_64_0 +libboost_wave1_64_0 +libboost_regex1_64_0 diff --git a/boost-strict_aliasing.patch b/boost-strict_aliasing.patch index ce0bfd2..f6b007e 100644 --- a/boost-strict_aliasing.patch +++ b/boost-strict_aliasing.patch @@ -2,11 +2,11 @@ Index: libs/python/build/Jamfile =================================================================== --- libs/python/build/Jamfile.orig +++ libs/python/build/Jamfile -@@ -116,6 +116,7 @@ rule lib_boost_python ( is-py3 ? ) +@@ -110,6 +110,7 @@ rule lib_boost_python ( version ) -@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).tag @$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).python-tag + -fno-strict-aliasing - : # default build - shared + @python.require-py + diff --git a/boost.changes b/boost.changes index 5a5a255..79b982a 100644 --- a/boost.changes +++ b/boost.changes @@ -1,3 +1,38 @@ +------------------------------------------------------------------- +Thu Apr 20 13:52:20 EST 2017 - adam.majer@suse.de + +- New upstream version 1.64.0 + + process - new library providing cross platform methods to + - create child processes + - setup stream for child processes + - sync and async communication streams with children + - sync and async wait + - process termination + + geometry library had some breaking changes, + - ublas_transformer is renamed to matrix_transformer + - explicit modifier is added to constructors of rtree + index::dynamic_* parameters + - strategy::area::huiller replaced by strategy::area::spherical + + context library updates + - deprecated API:execution-context + - fixed bad assembly for fcontext on ppc64/sysv/elf + + Updated libraries: any, atomic, config, container, context, + conversion, core, coroutine2, fiber, hash, interprocess, + intrusive, lexicalcast, math, multi-index containers, + multiprecision, predef, program options, regex, smart pointers, + test ,typeindex, typetraits, unordered, variant + + for details, see + http://www.boost.org/users/history/version_1_64_0.html +- Build PyNumpy module + + add build requires on python-numpy +- test_lowcase.patch: upstreamed +- refreshed patches: boost-strict_aliasing.patch, gcc_path.patch, + python_mpi.patch +- mpi_upstream.patch: pending upstream fixes to OpenMPI build +- python_library_name.patch: we are building python versions in + different stagings so drop library renames. +- python_numpy_retfunc.patch: rpmlint fixes + ------------------------------------------------------------------- Fri Feb 10 13:35:53 UTC 2017 - jmatejek@suse.com diff --git a/boost.spec b/boost.spec index 51a3c08..9b99ae9 100644 --- a/boost.spec +++ b/boost.spec @@ -16,11 +16,11 @@ # -%define ver 1.63.0 -%define file_version 1_63_0 +%define ver 1.64.0 +%define file_version 1_64_0 %define docs_version 1.56.0 %define short_version 1_56 -%define lib_appendix 1_63_0 +%define lib_appendix 1_64_0 %bcond_with build_docs %bcond_without package_pdf %bcond_without build_quickbook @@ -60,8 +60,8 @@ #%endif Name: boost -%define package_name boost_1_63 -Version: 1.63.0 +%define package_name boost_1_64 +Version: 1.64.0 Release: 0 Summary: Boost C++ Libraries License: BSL-1.0 @@ -92,7 +92,9 @@ Patch15: boost-1.57.0-python-abi_letters.patch Patch16: boost-1.55.0-python-test-PyImport_AppendInittab.patch Patch17: python_mpi.patch Patch18: dynamic_linking.patch -Patch19: test_lowcase.patch +Patch19: mpi_upstream.patch +Patch20: python_library_name.patch +Patch21: python_numpy_retfunc.patch Patch100: gcc_path.patch BuildRequires: chrpath BuildRequires: dos2unix @@ -110,8 +112,10 @@ BuildRequires: libbz2-devel BuildRequires: libexpat-devel BuildRequires: libicu-devel BuildRequires: python-devel +BuildRequires: python-numpy-devel %if %{with python3} BuildRequires: python3-devel +BuildRequires: python3-numpy-devel %endif #!BuildIgnore: python BuildRequires: zlib-devel @@ -705,7 +709,29 @@ Conflicts: otherproviders(libboost_python-devel) Conflicts: boost-devel < 1.63 %description -n libboost_python-py2_7-%{lib_appendix}-devel -Development headers for Boost.Python library for the default version of +Development headers for Boost::Python library for the default version of +python. + +%package -n libboost_numpy-py2_7-%{lib_appendix} +Summary: Boost.Python.NumPy runtime library +Group: System/Libraries +Requires: boost-license%{lib_appendix} + +%description -n libboost_numpy-py2_7-%{lib_appendix} +This package contains the Boost::Python::NumPy runtime library for default +version of python. + +%package -n libboost_numpy-py2_7-%{lib_appendix}-devel +Summary: Development headers for Boost.Python.NumPy library +Group: Development/Libraries/C and C++ +PreReq: libboost_headers%{lib_appendix}-devel = %{version} +Requires: libboost_numpy-py2_7-%{lib_appendix} = %{version} +Provides: libboost_numpy-devel = %{version} +Conflicts: otherproviders(libboost_numpy-devel) +Conflicts: boost-devel < 1.63 + +%description -n libboost_numpy-py2_7-%{lib_appendix}-devel +Development headers for Boost::Python::NumPy library for the default version of python. %if %{with python3} @@ -731,6 +757,28 @@ Conflicts: boost-devel < 1.63 Development headers for Boost.Python library. This package contains library for python3 development for boost. +%package -n libboost_numpy-py3-%{lib_appendix} +Summary: Boost.Python.NumPy runtime library +Group: System/Libraries +Requires: boost-license%{lib_appendix} + +%description -n libboost_numpy-py3-%{lib_appendix} +This package contains the Boost.Python.NumPy runtime libraries for python3 +bindings. + +%package -n libboost_numpy-py3-%{lib_appendix}-devel +Summary: Development headers for Boost.Python.NumPy library +Group: Development/Libraries/C and C++ +PreReq: libboost_headers%{lib_appendix}-devel = %{version} +Requires: libboost_numpy-py3-%{lib_appendix} = %{version} +Provides: libboost_numpy3-devel = %{version} +Conflicts: otherproviders(libboost_numpy3-devel) +Conflicts: boost-devel < 1.63 + +%description -n libboost_numpy-py3-%{lib_appendix}-devel +Development headers for Boost.Python.NumPy library. This package contains +library for python3 development for boost. + %endif # with python3 %package -n libboost_serialization%{lib_appendix} @@ -995,6 +1043,8 @@ find -type f ! \( -name \*.sh -o -name \*.py -o -name \*.pl \) -exec chmod -x {} %patch17 -p1 %patch18 -p1 %patch19 -p1 +%patch20 -p1 +%patch21 -p1 %patch100 -p1 #stupid build machinery copies .orig files @@ -1044,6 +1094,8 @@ cat << EOF >user-config.jam import os ; local RPM_OPT_FLAGS = [ os.environ RPM_OPT_FLAGS ] ; using gcc : : : \$(RPM_OPT_FLAGS) ; +project user-config ; +alias boost_python_alias : : /boost/python//boost_python ; EOF # Build boost base PYTHON and MPI, installed in python staging @@ -1076,13 +1128,14 @@ EOF # Build boost python3 and MPI, installed in python3 staging %if %{with python3} -%{?!py3_abiflags:%define py3_abiflags m} cp user-config.jam user-config-py3.jam +# sed -i -e 's#//boost_python#//boost_python3#' ./user-config-py3.jam +%{?!py3_abiflags:%define py3_abiflags m} cat << EOF >> user-config-py3.jam using python - : %{py3_ver} + : %{python3_version} : %{_bindir}/python3 - : %{_includedir}/python%{py3_ver}%{py3_abiflags} + : %{_includedir}/python%{python3_version}%{py3_abiflags} : : : .%{py3_soflags} @@ -1189,7 +1242,7 @@ ln -s bjam %{buildroot}%{_bindir}/jam rm %{buildroot}%{_libdir}/libboost_mpi_python.so rm %{buildroot}%{_libdir}/libboost_mpi_python.so.%{version} rm %{buildroot}%{_libdir}/libboost_python.so -rm %{buildroot}%{_libdir}/libboost_python.so.1.63.0 +rm %{buildroot}%{_libdir}/libboost_python.so.%{version} ! $(ldd %{buildroot}%{_libdir}/*.so* | grep python\\.) @@ -1197,8 +1250,8 @@ ln -s libboost_mpi_python-py2_7.so %{buildroot}%{_libdir}/libboost_mpi_python.so ln -s libboost_python-py2_7.so %{buildroot}%{_libdir}/libboost_python.so %if %{with python3} -rm %{buildroot}%{_libdir}/libboost_python3-py3.so -rm %{buildroot}%{_libdir}/libboost_python3-py3.so.%{version} +#rm %{buildroot}%{_libdir}/libboost_python3-py3.so +#rm %{buildroot}%{_libdir}/libboost_python3-py3.so.%{version} ! $(ldd %{buildroot}%{_libdir}/*.so* | grep python3-\\.) @@ -1296,8 +1349,12 @@ rm -r %{buildroot}%{_includedir}/boost/context %post -n libboost_python-py2_7-%{lib_appendix} -p /sbin/ldconfig +%post -n libboost_numpy-py2_7-%{lib_appendix} -p /sbin/ldconfig + %if %{with python3} %post -n libboost_python-py3-%{lib_appendix} -p /sbin/ldconfig + +%post -n libboost_numpy-py3-%{lib_appendix} -p /sbin/ldconfig %endif %post -n libboost_regex%{lib_appendix} -p /sbin/ldconfig @@ -1361,8 +1418,12 @@ rm -r %{buildroot}%{_includedir}/boost/context %postun -n libboost_python-py2_7-%{lib_appendix} -p /sbin/ldconfig +%postun -n libboost_numpy-py2_7-%{lib_appendix} -p /sbin/ldconfig + %if %{with python3} %postun -n libboost_python-py3-%{lib_appendix} -p /sbin/ldconfig + +%postun -n libboost_numpy-py3-%{lib_appendix} -p /sbin/ldconfig %endif %postun -n libboost_regex%{lib_appendix} -p /sbin/ldconfig @@ -1607,6 +1668,14 @@ rm -r %{buildroot}%{_includedir}/boost/context %{_libdir}/libboost_python.so %{_libdir}/libboost_python-py2_7.so +%files -n libboost_numpy-py2_7-%{lib_appendix} +%defattr(-, root, root, -) +%{_libdir}/libboost_numpy-py2_7.so.%{version} + +%files -n libboost_numpy-py2_7-%{lib_appendix}-devel +%defattr(-, root, root, -) +%{_libdir}/libboost_numpy-py2_7.so + %if %{with python3} %files -n libboost_python-py3-%{lib_appendix} %defattr(-, root, root, -) @@ -1617,6 +1686,14 @@ rm -r %{buildroot}%{_includedir}/boost/context %{_libdir}/libboost_python3.so %{_libdir}/libboost_python-py3.so +%files -n libboost_numpy-py3-%{lib_appendix} +%defattr(-, root, root, -) +%{_libdir}/libboost_numpy-py3.so.%{version} + +%files -n libboost_numpy-py3-%{lib_appendix}-devel +%defattr(-, root, root, -) +%{_libdir}/libboost_numpy-py3.so + %endif # with python3 %files -n libboost_serialization%{lib_appendix} diff --git a/boost_1_63_0.tar.bz2 b/boost_1_63_0.tar.bz2 deleted file mode 100644 index b0b65a7..0000000 --- a/boost_1_63_0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:beae2529f759f6b3bf3f4969a19c2e9d6f0c503edcb2de4a61d1428519fcb3b0 -size 81984414 diff --git a/boost_1_64_0.tar.bz2 b/boost_1_64_0.tar.bz2 new file mode 100644 index 0000000..dc3866c --- /dev/null +++ b/boost_1_64_0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7bcc5caace97baa948931d712ea5f37038dbb1c5d89b43ad4def4ed7cb683332 +size 80472424 diff --git a/gcc_path.patch b/gcc_path.patch index a148832..78b6c38 100644 --- a/gcc_path.patch +++ b/gcc_path.patch @@ -7,10 +7,10 @@ Boost assumes /usr/include/c++/x.y.z/ existence for GCC 4.x onward while our version of GCC only has /usr/include/c++/x.y for 4.x GCC and /usr/include/c++/x/ for 5.x onward. -Index: boost_1_62_0/boost/tr1/detail/config_all.hpp +Index: boost_1_64_0/boost/tr1/detail/config_all.hpp =================================================================== ---- boost_1_62_0.orig/boost/tr1/detail/config_all.hpp -+++ boost_1_62_0/boost/tr1/detail/config_all.hpp +--- boost_1_64_0.orig/boost/tr1/detail/config_all.hpp ++++ boost_1_64_0/boost/tr1/detail/config_all.hpp @@ -102,14 +102,12 @@ // compiler version: # define BOOST_TR1_STD_HEADER(name) <../4.0.0/name> diff --git a/mpi_upstream.patch b/mpi_upstream.patch new file mode 100644 index 0000000..ac988a7 --- /dev/null +++ b/mpi_upstream.patch @@ -0,0 +1,178 @@ +commit f5bdcc1ebfe954bb64835f2a0efd94471da42207 +Author: Jonathan Wakely +Date: Thu Feb 23 02:18:58 2017 +0000 + + Replace boost::serialization::detail::get_data function. (#39) + +commit 947d17157304ceb93926ab961487e9c86fc7c2d2 +Author: Jonathan Wakely +Date: Thu Feb 23 02:19:45 2017 +0000 + + Add header for serialization::make_array (#40) + +commit b21d95676028e45a6743be9898306f13fe715282 +Author: Andrey Semashev +Date: Thu Feb 23 05:17:32 2017 +0300 + + Fix incorrect usage of auto_ptr to free an array (#38) + + The `auto_ptr` would use `delete p` to free an array allocated with `operator new[]`, which could result in heap corruption. Replaced it with `scoped_array`. + +commit 98c406a77f8506550276a8e81ad6ed0c961fca8f +Author: Alain Miniussi +Date: Thu Feb 23 11:26:49 2017 +0100 + + documentation typo + +Index: boost_1_64_0/boost/mpi/python/serialize.hpp +=================================================================== +--- boost_1_64_0.orig/boost/mpi/python/serialize.hpp ++++ boost_1_64_0/boost/mpi/python/serialize.hpp +@@ -26,7 +26,6 @@ + #include + #include + +-#include + #include + + #include +@@ -36,6 +35,9 @@ + + #include + #include ++#include ++ ++#include + + #include + +@@ -441,7 +443,7 @@ load_impl(Archiver& ar, boost::python::o + int len; + ar >> len; + +- std::auto_ptr string(new char[len]); ++ boost::scoped_array string(new char[len]); + ar >> boost::serialization::make_array(string.get(), len); + boost::python::str py_string(string.get(), len); + obj = boost::python::pickle::loads(py_string); +Index: boost_1_64_0/boost/mpi/detail/mpi_datatype_primitive.hpp +=================================================================== +--- boost_1_64_0.orig/boost/mpi/detail/mpi_datatype_primitive.hpp ++++ boost_1_64_0/boost/mpi/detail/mpi_datatype_primitive.hpp +@@ -25,7 +25,6 @@ namespace std{ + #include + #include + #include +-#include + #include + #include + #include +@@ -80,18 +79,18 @@ public: + BOOST_MPI_CHECK_RESULT(MPI_Type_create_struct, + ( + addresses.size(), +- boost::serialization::detail::get_data(lengths), +- boost::serialization::detail::get_data(addresses), +- boost::serialization::detail::get_data(types), ++ get_data(lengths), ++ get_data(addresses), ++ get_data(types), + &datatype_ + )); + #else + BOOST_MPI_CHECK_RESULT(MPI_Type_struct, + ( + addresses.size(), +- boost::serialization::detail::get_data(lengths), +- boost::serialization::detail::get_data(addresses), +- boost::serialization::detail::get_data(types), ++ get_data(lengths), ++ get_data(addresses), ++ get_data(types), + &datatype_ + )); + #endif +@@ -129,6 +128,12 @@ private: + lengths.push_back(l); + } + ++ template ++ static T* get_data(std::vector& v) ++ { ++ return v.empty() ? 0 : &(v[0]); ++ } ++ + std::vector addresses; + std::vector types; + std::vector lengths; +Index: boost_1_64_0/boost/mpi/detail/packed_iprimitive.hpp +=================================================================== +--- boost_1_64_0.orig/boost/mpi/detail/packed_iprimitive.hpp ++++ boost_1_64_0/boost/mpi/detail/packed_iprimitive.hpp +@@ -16,7 +16,6 @@ + #include + #include + #include +-#include + #include + #include + +@@ -104,7 +103,12 @@ private: + void load_impl(void * p, MPI_Datatype t, int l) + { + BOOST_MPI_CHECK_RESULT(MPI_Unpack, +- (const_cast(boost::serialization::detail::get_data(buffer_)), buffer_.size(), &position, p, l, t, comm)); ++ (get_data(buffer_), buffer_.size(), &position, p, l, t, comm)); ++ } ++ ++ static buffer_type::value_type* get_data(buffer_type& b) ++ { ++ return b.empty() ? 0 : &(b[0]); + } + + buffer_type & buffer_; +Index: boost_1_64_0/boost/mpi/detail/packed_oprimitive.hpp +=================================================================== +--- boost_1_64_0.orig/boost/mpi/detail/packed_oprimitive.hpp ++++ boost_1_64_0/boost/mpi/detail/packed_oprimitive.hpp +@@ -15,7 +15,6 @@ + + #include + #include +-#include + #include + #include + #include +@@ -98,13 +97,18 @@ private: + + // pack the data into the buffer + BOOST_MPI_CHECK_RESULT(MPI_Pack, +- (const_cast(p), l, t, boost::serialization::detail::get_data(buffer_), buffer_.size(), &position, comm)); ++ (const_cast(p), l, t, get_data(buffer_), buffer_.size(), &position, comm)); + // reduce the buffer size if needed + BOOST_ASSERT(std::size_t(position) <= buffer_.size()); + if (std::size_t(position) < buffer_.size()) + buffer_.resize(position); + } + ++ static buffer_type::value_type* get_data(buffer_type& b) ++ { ++ return b.empty() ? 0 : &(b[0]); ++ } ++ + buffer_type& buffer_; + mutable std::size_t size_; + MPI_Comm comm; +Index: boost_1_64_0/boost/mpi/communicator.hpp +=================================================================== +--- boost_1_64_0.orig/boost/mpi/communicator.hpp ++++ boost_1_64_0/boost/mpi/communicator.hpp +@@ -850,7 +850,7 @@ class BOOST_MPI_DECL communicator + optional as_graph_communicator() const; + + /** +- * Determines whether this communicator has a Cartesian topology. ++ * Determines whether this communicator has a Graph topology. + */ + bool has_cartesian_topology() const; + diff --git a/python_library_name.patch b/python_library_name.patch new file mode 100644 index 0000000..a6d99ba --- /dev/null +++ b/python_library_name.patch @@ -0,0 +1,94 @@ +Python module needs to be built without these extra renames. +MPI module needs to reference correct python + +~Index: boost_1_64_0/libs/mpi/build/Jamfile.v2 +~=================================================================== +~--- boost_1_64_0.orig/libs/mpi/build/Jamfile.v2 +~+++ boost_1_64_0/libs/mpi/build/Jamfile.v2 +~@@ -61,10 +61,10 @@ libraries += boost_mpi ; +~ lib boost_mpi_python +~ : # Sources +~ python/serialize.cpp +~+ /user-config//boost_python_alias +~ : # Requirements +~ boost_mpi +~ /mpi//mpi [ mpi.extra-requirements ] +~- /boost/python//boost_python +~ shared:BOOST_MPI_DYN_LINK=1 +~ shared:BOOST_MPI_PYTHON_DYN_LINK=1 +~ shared:BOOST_PYTHON_DYN_LINK=1 +~@@ -92,8 +92,8 @@ libraries += boost_mpi ; +~ python/skeleton_and_content.cpp +~ python/status.cpp +~ python/py_timer.cpp +~+ /user-config//boost_python_alias +~ : # Requirements +~- /boost/python//boost_python +~ boost_mpi_python +~ boost_mpi +~ /mpi//mpi [ mpi.extra-requirements ] +Index: boost_1_64_0/libs/python/build/Jamfile +=================================================================== +--- boost_1_64_0.orig/libs/python/build/Jamfile ++++ boost_1_64_0/libs/python/build/Jamfile +@@ -42,15 +42,15 @@ rule cond ( test ? : yes * : no * ) { if + rule unless ( test ? : yes * : no * ) { if ! $(test) { return $(yes) ; } else { return $(no) ; } } + local rule eq ( a : b ) { if $(a) = $(b) { return 1 ; } } + +-lib_boost_python(2) = boost_python ; +-lib_boost_python(3) = boost_python3 ; ++#lib_boost_python(2) = boost_python ; ++#lib_boost_python(3) = boost_python3 ; + +-lib_boost_python($(py2-version)) = $(lib_boost_python(2)) ; +-lib_boost_python($(py3-version)) = $(lib_boost_python(3)) ; ++#lib_boost_python($(py2-version)) = $(lib_boost_python(2)) ; ++#lib_boost_python($(py3-version)) = $(lib_boost_python(3)) ; + + rule lib_boost_python ( version ) + { +- lib $(lib_boost_python($(version))) ++ lib boost_python #$(lib_boost_python($(version))) + : # sources + numeric.cpp + list.cpp +@@ -122,16 +122,16 @@ rule lib_boost_python ( version ) + ; + } + +-lib_boost_numpy(2) = boost_numpy ; +-lib_boost_numpy(3) = boost_numpy3 ; ++#lib_boost_numpy(2) = boost_numpy ; ++#lib_boost_numpy(3) = boost_numpy3 ; + +-lib_boost_numpy($(py2-version)) = $(lib_boost_numpy(2)) ; +-lib_boost_numpy($(py3-version)) = $(lib_boost_numpy(3)) ; ++#lib_boost_numpy($(py2-version)) = $(lib_boost_numpy(2)) ; ++#lib_boost_numpy($(py3-version)) = $(lib_boost_numpy(3)) ; + + rule lib_boost_numpy ( version ) + { + numpy-include = [ python.numpy-include ] ; +- lib $(lib_boost_numpy($(version))) ++ lib boost_numpy #$(lib_boost_numpy($(version))) + : # sources + numpy/dtype.cpp + numpy/matrix.cpp +@@ -173,7 +173,7 @@ for local N in 2 3 + } + else + { +- alias $(lib_boost_python($(N))) ; ++ #alias $(lib_boost_python($(N))) ; + } + if $(py$(N)-version) && [ python.numpy ] + { +@@ -182,7 +182,7 @@ for local N in 2 3 + } + else + { +- alias $(lib_boost_numpy($(N))) ; ++ #alias $(lib_boost_numpy($(N))) ; + } + } + diff --git a/python_mpi.patch b/python_mpi.patch index 9caa853..f79d8b0 100644 --- a/python_mpi.patch +++ b/python_mpi.patch @@ -5,10 +5,10 @@ MPI requires dl.RTLD_NOW|dl.RTLD_GLOBAL flags to load properly. -Index: boost_1_63_0/libs/mpi/build/__init__.py +Index: boost_1_64_0/libs/mpi/build/__init__.py =================================================================== ---- boost_1_63_0.orig/libs/mpi/build/__init__.py -+++ boost_1_63_0/libs/mpi/build/__init__.py +--- boost_1_64_0.orig/libs/mpi/build/__init__.py ++++ boost_1_64_0/libs/mpi/build/__init__.py @@ -1,10 +1,7 @@ import sys -if sys.platform == 'linux2': diff --git a/python_numpy_retfunc.patch b/python_numpy_retfunc.patch new file mode 100644 index 0000000..bc6bfd7 --- /dev/null +++ b/python_numpy_retfunc.patch @@ -0,0 +1,22 @@ +Author: Adam Majer +Date: Tue Apr 4 10:18:49 CEST 2017 +Summary: rpmlint fixes? + +After build, the following errors were returned. + +[ 110s] libs/python/src/numpy/numpy.cpp: In function 'void* boost::python::numpy::wrap_import_array()': +[ 110s] libs/python/src/numpy/numpy.cpp:22:1: warning: control reaches end of non-void function [-Wreturn-type] +[ 110s] } + +Index: boost_1_64_0/libs/python/src/numpy/numpy.cpp +=================================================================== +--- boost_1_64_0.orig/libs/python/src/numpy/numpy.cpp ++++ boost_1_64_0/libs/python/src/numpy/numpy.cpp +@@ -19,6 +19,7 @@ static void wrap_import_array() + static void * wrap_import_array() + { + import_array(); ++ return NULL; // import_array no longer auto-returns? + } + #endif + diff --git a/test_lowcase.patch b/test_lowcase.patch deleted file mode 100644 index 0036d1f..0000000 --- a/test_lowcase.patch +++ /dev/null @@ -1,1058 +0,0 @@ -Author: Adam Majer -PR: https://github.com/boostorg/test/pull/108 -Summary: Change capital variable names to lowercase - -Capitals clash by convention with #define, and in this case -VERSION clashes with GNU Autotools. - - -Index: boost_1_63_0/boost/test/impl/unit_test_parameters.ipp -=================================================================== ---- boost_1_63_0.orig/boost/test/impl/unit_test_parameters.ipp -+++ boost_1_63_0/boost/test/impl/unit_test_parameters.ipp -@@ -71,35 +71,35 @@ namespace rt = boost::runtime; - namespace runtime_config { - - // UTF parameters --std::string AUTO_START_DBG = "auto_start_dbg"; --std::string BREAK_EXEC_PATH = "break_exec_path"; --std::string BUILD_INFO = "build_info"; --std::string CATCH_SYS_ERRORS = "catch_system_errors"; --std::string COLOR_OUTPUT = "color_output"; --std::string DETECT_FP_EXCEPT = "detect_fp_exceptions"; --std::string DETECT_MEM_LEAKS = "detect_memory_leaks"; --std::string LIST_CONTENT = "list_content"; --std::string LIST_LABELS = "list_labels"; --std::string LOG_FORMAT = "log_format"; --std::string LOG_LEVEL = "log_level"; --std::string LOG_SINK = "log_sink"; --std::string COMBINED_LOGGER = "logger"; --std::string OUTPUT_FORMAT = "output_format"; --std::string RANDOM_SEED = "random"; --std::string REPORT_FORMAT = "report_format"; --std::string REPORT_LEVEL = "report_level"; --std::string REPORT_MEM_LEAKS = "report_memory_leaks_to"; --std::string REPORT_SINK = "report_sink"; --std::string RESULT_CODE = "result_code"; --std::string RUN_FILTERS = "run_test"; --std::string SAVE_TEST_PATTERN = "save_pattern"; --std::string SHOW_PROGRESS = "show_progress"; --std::string USE_ALT_STACK = "use_alt_stack"; --std::string WAIT_FOR_DEBUGGER = "wait_for_debugger"; -- --std::string HELP = "help"; --std::string USAGE = "usage"; --std::string VERSION = "version"; -+std::string auto_start_dbg_str = "auto_start_dbg"; -+std::string break_exec_path_str = "break_exec_path"; -+std::string build_info_str = "build_info"; -+std::string catch_sys_errors_str = "catch_system_errors"; -+std::string color_output_str = "color_output"; -+std::string detect_fp_except_str = "detect_fp_exceptions"; -+std::string detect_mem_leaks_str = "detect_memory_leaks"; -+std::string list_content_str = "list_content"; -+std::string list_labels_str = "list_labels"; -+std::string log_format_str = "log_format"; -+std::string log_level_str = "log_level"; -+std::string log_sink_str = "log_sink"; -+std::string combined_logger_str = "logger"; -+std::string output_format_str = "output_format"; -+std::string random_seed_str = "random"; -+std::string report_format_str = "report_format"; -+std::string report_level_str = "report_level"; -+std::string report_mem_leaks_str = "report_memory_leaks_to"; -+std::string report_sink_str = "report_sink"; -+std::string result_code_str = "result_code"; -+std::string run_filters_str = "run_test"; -+std::string save_test_pattern_str = "save_pattern"; -+std::string show_progress_str = "show_progress"; -+std::string use_alt_stack_str = "use_alt_stack"; -+std::string wait_for_debugger_str = "wait_for_debugger"; -+ -+std::string help_str = "help"; -+std::string usage_str = "usage"; -+std::string version_str = "version"; - - //____________________________________________________________________________// - -@@ -108,11 +108,11 @@ namespace { - void - register_parameters( rt::parameters_store& store ) - { -- rt::option auto_start_dbg( AUTO_START_DBG, ( -+ rt::option auto_start_dbg( auto_start_dbg_str, ( - rt::description = "Automatically attaches debugger in case of system level failure (signal).", - rt::env_var = "BOOST_TEST_AUTO_START_DBG", - -- rt::help = "Option " + AUTO_START_DBG + " specifies whether Boost.Test should attempt " -+ rt::help = "Option " + auto_start_dbg_str + " specifies whether Boost.Test should attempt " - "to attach a debugger when fatal system error occurs. At the moment this feature " - "is only available on a few selected platforms: Win32 and *nix. There is a " - "default debugger configured for these platforms. You can manually configure " -@@ -120,13 +120,13 @@ register_parameters( rt::parameters_stor - "Boost.Test debug API, specifically the function boost::debug::set_debugger." - )); - -- auto_start_dbg.add_cla_id( "--", AUTO_START_DBG, "=" ); -+ auto_start_dbg.add_cla_id( "--", auto_start_dbg_str, "=" ); - auto_start_dbg.add_cla_id( "-", "d", " " ); - store.add( auto_start_dbg ); - - /////////////////////////////////////////////// - -- rt::parameter break_exec_path( BREAK_EXEC_PATH, ( -+ rt::parameter break_exec_path( break_exec_path_str, ( - rt::description = "For the exception safety testing allows to break at specific execution path.", - rt::env_var = "BOOST_TEST_BREAK_EXEC_PATH" - #ifndef BOOST_NO_CXX11_LAMBDAS -@@ -137,25 +137,25 @@ register_parameters( rt::parameters_stor - #endif - )); - -- break_exec_path.add_cla_id( "--", BREAK_EXEC_PATH, "=" ); -+ break_exec_path.add_cla_id( "--", break_exec_path_str, "=" ); - store.add( break_exec_path ); - - /////////////////////////////////////////////// - -- rt::option build_info( BUILD_INFO, ( -+ rt::option build_info( build_info_str, ( - rt::description = "Displays library build information.", - rt::env_var = "BOOST_TEST_BUILD_INFO", -- rt::help = "Option " + BUILD_INFO + " displays library build information, including: platform, " -+ rt::help = "Option " + build_info_str + " displays library build information, including: platform, " - "compiler, STL version and Boost version." - )); - -- build_info.add_cla_id( "--", BUILD_INFO, "=" ); -+ build_info.add_cla_id( "--", build_info_str, "=" ); - build_info.add_cla_id( "-", "i", " " ); - store.add( build_info ); - - /////////////////////////////////////////////// - -- rt::option catch_sys_errors( CATCH_SYS_ERRORS, ( -+ rt::option catch_sys_errors( catch_sys_errors_str, ( - rt::description = "Allows to switch between catching and ignoring system errors (signals).", - rt::env_var = "BOOST_TEST_CATCH_SYSTEM_ERRORS", - rt::default_value = -@@ -164,7 +164,7 @@ register_parameters( rt::parameters_stor - #else - true, - #endif -- rt::help = "If option " + CATCH_SYS_ERRORS + " has value no the frameworks does not attempt to catch " -+ rt::help = "If option " + catch_sys_errors_str + " has value no the frameworks does not attempt to catch " - "asynchronous system failure events (signals on *NIX platforms or structured exceptions on Windows). " - " Default value is " - #ifdef BOOST_TEST_DEFAULTS_TO_CORE_DUMP -@@ -174,13 +174,13 @@ register_parameters( rt::parameters_stor - #endif - )); - -- catch_sys_errors.add_cla_id( "--", CATCH_SYS_ERRORS, "=", true ); -+ catch_sys_errors.add_cla_id( "--", catch_sys_errors_str, "=", true ); - catch_sys_errors.add_cla_id( "-", "s", " " ); - store.add( catch_sys_errors ); - - /////////////////////////////////////////////// - -- rt::option color_output( COLOR_OUTPUT, ( -+ rt::option color_output( color_output_str, ( - rt::description = "Enables color output of the framework log and report messages.", - rt::env_var = "BOOST_TEST_COLOR_OUTPUT", - rt::help = "The framework is able to produce color output on systems which supports it. " -@@ -188,31 +188,31 @@ register_parameters( rt::parameters_stor - "does not produces color output." - )); - -- color_output.add_cla_id( "--", COLOR_OUTPUT, "=", true ); -+ color_output.add_cla_id( "--", color_output_str, "=", true ); - color_output.add_cla_id( "-", "x", " " ); - store.add( color_output ); - - /////////////////////////////////////////////// - -- rt::option detect_fp_except( DETECT_FP_EXCEPT, ( -+ rt::option detect_fp_except( detect_fp_except_str, ( - rt::description = "Enables/disables floating point exceptions traps.", - rt::env_var = "BOOST_TEST_DETECT_FP_EXCEPTIONS", -- rt::help = "Option " + DETECT_FP_EXCEPT + " enables/disables hardware traps for the floating " -+ rt::help = "Option " + detect_fp_except_str + " enables/disables hardware traps for the floating " - "point exceptions (if supported on your platfrom)." - )); - -- detect_fp_except.add_cla_id( "--", DETECT_FP_EXCEPT, "=", true ); -+ detect_fp_except.add_cla_id( "--", detect_fp_except_str, "=", true ); - store.add( detect_fp_except ); - - /////////////////////////////////////////////// - -- rt::parameter detect_mem_leaks( DETECT_MEM_LEAKS, ( -+ rt::parameter detect_mem_leaks( detect_mem_leaks_str, ( - rt::description = "Turns on/off memory leaks detection (optionally breaking on specified alloc order number).", - rt::env_var = "BOOST_TEST_DETECT_MEMORY_LEAK", - rt::default_value = 1L, - rt::optional_value = 1L, - rt::value_hint = "", -- rt::help = "Parameter " + DETECT_MEM_LEAKS + " enables/disables memory leaks detection. " -+ rt::help = "Parameter " + detect_mem_leaks_str + " enables/disables memory leaks detection. " - "This parameter has optional long integer value. The default value is 1, which " - "enables the memory leak detection. The value 0 disables memory leak detection. " - "Any value N greater than 1 is treated as leak allocation number and tells the " -@@ -220,12 +220,12 @@ register_parameters( rt::parameters_stor - "omitted the default value is assumed." - )); - -- detect_mem_leaks.add_cla_id( "--", DETECT_MEM_LEAKS, "=" ); -+ detect_mem_leaks.add_cla_id( "--", detect_mem_leaks_str, "=" ); - store.add( detect_mem_leaks ); - - /////////////////////////////////////////////// - -- rt::enum_parameter list_content( LIST_CONTENT, ( -+ rt::enum_parameter list_content( list_content_str, ( - rt::description = "Lists the content of test tree - names of all test suites and test cases.", - rt::env_var = "BOOST_TEST_LIST_CONTENT", - rt::default_value = OF_INVALID, -@@ -242,30 +242,30 @@ register_parameters( rt::parameters_stor - ( "DOT", OF_DOT ) - , - #endif -- rt::help = "Parameter " + LIST_CONTENT + " instructs the framework to list the content " -+ rt::help = "Parameter " + list_content_str + " instructs the framework to list the content " - "of the test module instead of executing the test cases. Parameter accepts " - "optional string value indicating the format of the output. Currently the " - "framework supports two formats: human readable format (HRF) and dot graph " - "format (DOT). If value is omitted HRF value is assumed." - )); -- list_content.add_cla_id( "--", LIST_CONTENT, "=" ); -+ list_content.add_cla_id( "--", list_content_str, "=" ); - store.add( list_content ); - - /////////////////////////////////////////////// - -- rt::option list_labels( LIST_LABELS, ( -+ rt::option list_labels( list_labels_str, ( - rt::description = "Lists all available labels.", - rt::env_var = "BOOST_TEST_LIST_LABELS", -- rt::help = "Option " + LIST_LABELS + " instructs the framework to list all the the labels " -+ rt::help = "Option " + list_labels_str + " instructs the framework to list all the the labels " - "defined in the test module instead of executing the test cases." - )); - -- list_labels.add_cla_id( "--", LIST_LABELS, "=" ); -+ list_labels.add_cla_id( "--", list_labels_str, "=" ); - store.add( list_labels ); - - /////////////////////////////////////////////// - -- rt::enum_parameter log_format( LOG_FORMAT, ( -+ rt::enum_parameter log_format( log_format_str, ( - rt::description = "Specifies log format.", - rt::env_var = "BOOST_TEST_LOG_FORMAT", - rt::default_value = OF_CLF, -@@ -285,7 +285,7 @@ register_parameters( rt::parameters_stor - ( "JUNIT", OF_JUNIT ) - , - #endif -- rt::help = "Parameter " + LOG_FORMAT + " allows to set the frameowrk's log format to one " -+ rt::help = "Parameter " + log_format_str + " allows to set the frameowrk's log format to one " - "of the formats supplied by the framework. The only acceptable values for this " - "parameter are the names of the output formats supplied by the framework. By " - "default the framework uses human readable format (HRF) for testing log. This " -@@ -293,13 +293,13 @@ register_parameters( rt::parameters_stor - "or JUNIT as log format, which are easier to process by testing automation tools." - )); - -- log_format.add_cla_id( "--", LOG_FORMAT, "=" ); -+ log_format.add_cla_id( "--", log_format_str, "=" ); - log_format.add_cla_id( "-", "f", " " ); - store.add( log_format ); - - /////////////////////////////////////////////// - -- rt::enum_parameter log_level( LOG_LEVEL, ( -+ rt::enum_parameter log_level( log_level_str, ( - rt::description = "Specifies log level.", - rt::env_var = "BOOST_TEST_LOG_LEVEL", - rt::default_value = log_all_errors, -@@ -333,7 +333,7 @@ register_parameters( rt::parameters_stor - ( "nothing" , log_nothing ) - , - #endif -- rt::help = "Parameter " + LOG_LEVEL + " allows to set the framework's log level. " -+ rt::help = "Parameter " + log_level_str + " allows to set the framework's log level. " - "Log level defines the verbosity of testing log produced by a testing " - "module. The verbosity ranges from a complete log, when all assertions " - "(both successful and failing) are reported, all notifications about " -@@ -341,29 +341,29 @@ register_parameters( rt::parameters_stor - "is reported to a testing log stream." - )); - -- log_level.add_cla_id( "--", LOG_LEVEL, "=" ); -+ log_level.add_cla_id( "--", log_level_str, "=" ); - log_level.add_cla_id( "-", "l", " " ); - store.add( log_level ); - - /////////////////////////////////////////////// - -- rt::parameter log_sink( LOG_SINK, ( -+ rt::parameter log_sink( log_sink_str, ( - rt::description = "Specifies log sink: stdout(default), stderr or file name.", - rt::env_var = "BOOST_TEST_LOG_SINK", - rt::value_hint = "", -- rt::help = "Parameter " + LOG_SINK + " allows to set the log sink - location " -+ rt::help = "Parameter " + log_sink_str + " allows to set the log sink - location " - "where we report the log to, thus it allows to easily redirect the " - "test logs to file or standard streams. By default testing log is " - "directed to standard output." - )); - -- log_sink.add_cla_id( "--", LOG_SINK, "=" ); -+ log_sink.add_cla_id( "--", log_sink_str, "=" ); - log_sink.add_cla_id( "-", "k", " " ); - store.add( log_sink ); - - /////////////////////////////////////////////// - -- rt::enum_parameter output_format( OUTPUT_FORMAT, ( -+ rt::enum_parameter output_format( output_format_str, ( - rt::description = "Specifies output format (both log and report).", - rt::env_var = "BOOST_TEST_OUTPUT_FORMAT", - rt::enum_values::value = -@@ -380,8 +380,8 @@ register_parameters( rt::parameters_stor - ( "XML", OF_XML ) - , - #endif -- rt::help = "Parameter " + OUTPUT_FORMAT + " combines an effect of " + REPORT_FORMAT + -- " and " + LOG_FORMAT + " parameters. This parameter has higher priority " -+ rt::help = "Parameter " + output_format_str + " combines an effect of " + report_format_str + -+ " and " + log_format_str + " parameters. This parameter has higher priority " - "than either one of them. In other words if this parameter is specified " - "it overrides the value of other two parameters. This parameter does not " - "have a default value. The only acceptable values are string names of " -@@ -389,33 +389,33 @@ register_parameters( rt::parameters_stor - "automation tools processing." - )); - -- output_format.add_cla_id( "--", OUTPUT_FORMAT, "=" ); -+ output_format.add_cla_id( "--", output_format_str, "=" ); - output_format.add_cla_id( "-", "o", " " ); - store.add( output_format ); - - /////////////////////////////////////////////// combined logger option - -- rt::parameter combined_logger( COMBINED_LOGGER, ( -+ rt::parameter combined_logger( combined_logger_str, ( - rt::description = "Specifies log level and sink for one or several log format", - rt::env_var = "BOOST_TEST_LOGGER", - rt::value_hint = "log_format:log_level:log_sink", -- rt::help = "Parameter " + COMBINED_LOGGER + " allows to specify the logger type, level and sink\n" -+ rt::help = "Parameter " + combined_logger_str + " allows to specify the logger type, level and sink\n" - "in one command." - )); - -- combined_logger.add_cla_id( "--", COMBINED_LOGGER, "=" ); -+ combined_logger.add_cla_id( "--", combined_logger_str, "=" ); - store.add( combined_logger ); - - /////////////////////////////////////////////// - -- rt::parameter random_seed( RANDOM_SEED, ( -+ rt::parameter random_seed( random_seed_str, ( - rt::description = "Allows to switch between sequential and random order of test units execution." - " Optionally allows to specify concrete seed for random number generator.", - rt::env_var = "BOOST_TEST_RANDOM", - rt::default_value = 0U, - rt::optional_value = 1U, - rt::value_hint = "", -- rt::help = "Parameter " + RANDOM_SEED + " instructs the framework to execute the " -+ rt::help = "Parameter " + random_seed_str + " instructs the framework to execute the " - "test cases in random order. This parameter accepts optional unsigned " - "integer argument. By default test cases are executed in some specific " - "order defined by order of test units in test files and dependency between " -@@ -425,12 +425,12 @@ register_parameters( rt::parameters_stor - "the run." - )); - -- random_seed.add_cla_id( "--", RANDOM_SEED, "=" ); -+ random_seed.add_cla_id( "--", random_seed_str, "=" ); - store.add( random_seed ); - - /////////////////////////////////////////////// - -- rt::enum_parameter report_format( REPORT_FORMAT, ( -+ rt::enum_parameter report_format( report_format_str, ( - rt::description = "Specifies report format.", - rt::env_var = "BOOST_TEST_REPORT_FORMAT", - rt::default_value = OF_CLF, -@@ -448,7 +448,7 @@ register_parameters( rt::parameters_stor - ( "XML", OF_XML ) - , - #endif -- rt::help = "Parameter " + REPORT_FORMAT + " allows to set the framework's report format " -+ rt::help = "Parameter " + report_format_str + " allows to set the framework's report format " - "to one of the formats supplied by the framework. The only acceptable values " - "for this parameter are the names of the output formats. By default the framework " - "uses human readable format (HRF) for results reporting. Alternatively you can " -@@ -456,13 +456,13 @@ register_parameters( rt::parameters_stor - "automation tools." - )); - -- report_format.add_cla_id( "--", REPORT_FORMAT, "=" ); -+ report_format.add_cla_id( "--", report_format_str, "=" ); - report_format.add_cla_id( "-", "m", " " ); - store.add( report_format ); - - /////////////////////////////////////////////// - -- rt::enum_parameter report_level( REPORT_LEVEL, ( -+ rt::enum_parameter report_level( report_level_str, ( - rt::description = "Specifies report level.", - rt::env_var = "BOOST_TEST_REPORT_LEVEL", - rt::default_value = CONFIRMATION_REPORT, -@@ -482,155 +482,155 @@ register_parameters( rt::parameters_stor - ( "no", NO_REPORT ) - , - #endif -- rt::help = "Parameter " + REPORT_LEVEL + " allows to set the verbosity level of the " -+ rt::help = "Parameter " + report_level_str + " allows to set the verbosity level of the " - "testing result report generated by the framework. Use value 'no' to " - "eliminate the results report completely." - )); - -- report_level.add_cla_id( "--", REPORT_LEVEL, "=" ); -+ report_level.add_cla_id( "--", report_level_str, "=" ); - report_level.add_cla_id( "-", "r", " " ); - store.add( report_level ); - - /////////////////////////////////////////////// - -- rt::parameter report_mem_leaks( REPORT_MEM_LEAKS, ( -+ rt::parameter report_mem_leaks( report_mem_leaks_str, ( - rt::description = "File where to report memory leaks to.", - rt::env_var = "BOOST_TEST_REPORT_MEMORY_LEAKS_TO", - rt::default_value = std::string(), - rt::value_hint = "", -- rt::help = "Parameter " + REPORT_MEM_LEAKS + " allows to specify a file where to report " -+ rt::help = "Parameter " + report_mem_leaks_str + " allows to specify a file where to report " - "memory leaks to. The parameter does not have default value. If it is not specified, " - "memory leaks (if any) are reported to the standard error stream." - )); - -- report_mem_leaks.add_cla_id( "--", REPORT_MEM_LEAKS, "=" ); -+ report_mem_leaks.add_cla_id( "--", report_mem_leaks_str, "=" ); - store.add( report_mem_leaks ); - - /////////////////////////////////////////////// - -- rt::parameter report_sink( REPORT_SINK, ( -+ rt::parameter report_sink( report_sink_str, ( - rt::description = "Specifies report sink: stderr(default), stdout or file name.", - rt::env_var = "BOOST_TEST_REPORT_SINK", - rt::value_hint = "", -- rt::help = "Parameter " + REPORT_SINK + " allows to set the result report sink - " -+ rt::help = "Parameter " + report_sink_str + " allows to set the result report sink - " - "the location where the framework writes the result report to, thus it " - "allows to easily redirect the result report to a file or a standard " - "stream. By default the testing result report is directed to the " - "standard error stream." - )); - -- report_sink.add_cla_id( "--", REPORT_SINK, "=" ); -+ report_sink.add_cla_id( "--", report_sink_str, "=" ); - report_sink.add_cla_id( "-", "e", " " ); - store.add( report_sink ); - - /////////////////////////////////////////////// - -- rt::option result_code( RESULT_CODE, ( -+ rt::option result_code( result_code_str, ( - rt::description = "Disables test modules's result code generation.", - rt::env_var = "BOOST_TEST_RESULT_CODE", - rt::default_value = true, -- rt::help = "The 'no' argument value for the parameter " + RESULT_CODE + " instructs the " -+ rt::help = "The 'no' argument value for the parameter " + result_code_str + " instructs the " - "framework to always return zero result code. This can be used for test programs " - "executed within IDE. By default this parameter has value 'yes'." - )); - -- result_code.add_cla_id( "--", RESULT_CODE, "=", true ); -+ result_code.add_cla_id( "--", result_code_str, "=", true ); - result_code.add_cla_id( "-", "c", " " ); - store.add( result_code ); - - /////////////////////////////////////////////// - -- rt::parameter tests_to_run( RUN_FILTERS, ( -+ rt::parameter tests_to_run( run_filters_str, ( - rt::description = "Filters, which test units to include or exclude from test module execution.", - rt::env_var = "BOOST_TEST_RUN_FILTERS", - rt::value_hint = "", -- rt::help = "Parameter " + RUN_FILTERS + " allows to filter which test units to execute during " -+ rt::help = "Parameter " + run_filters_str + " allows to filter which test units to execute during " - "testing. The framework supports both 'selection filters', which allow to select " - "which test units to enable from the set of available test units, and 'disabler " - "filters', which allow to disable some test units. The __UTF__ also supports " - "enabling/disabling test units at compile time. These settings identify the default " -- "set of test units to run. Parameter " + RUN_FILTERS + " is used to change this default. " -+ "set of test units to run. Parameter " + run_filters_str + " is used to change this default. " - "This parameter is repeatable, so you can specify more than one filter if necessary." - )); - -- tests_to_run.add_cla_id( "--", RUN_FILTERS, "=" ); -+ tests_to_run.add_cla_id( "--", run_filters_str, "=" ); - tests_to_run.add_cla_id( "-", "t", " " ); - store.add( tests_to_run ); - - /////////////////////////////////////////////// - -- rt::option save_test_pattern( SAVE_TEST_PATTERN, ( -+ rt::option save_test_pattern( save_test_pattern_str, ( - rt::description = "Allows to switch between saving or matching test pattern file.", - rt::env_var = "BOOST_TEST_SAVE_PATTERN", -- rt::help = "Parameter " + SAVE_TEST_PATTERN + " facilitates switching mode of operation for " -+ rt::help = "Parameter " + save_test_pattern_str + " facilitates switching mode of operation for " - "testing output streams.\n\nThis parameter serves no particular purpose within the " - "framework itself. It can be used by test modules relying on output_test_stream to " - "implement testing logic. Default mode is 'match' (false)." - )); - -- save_test_pattern.add_cla_id( "--", SAVE_TEST_PATTERN, "=" ); -+ save_test_pattern.add_cla_id( "--", save_test_pattern_str, "=" ); - store.add( save_test_pattern ); - - /////////////////////////////////////////////// - -- rt::option show_progress( SHOW_PROGRESS, ( -+ rt::option show_progress( show_progress_str, ( - rt::description = "Turns on progress display.", - rt::env_var = "BOOST_TEST_SHOW_PROGRESS", -- rt::help = "Parameter " + SHOW_PROGRESS + " instructs the framework to display test progress " -+ rt::help = "Parameter " + show_progress_str + " instructs the framework to display test progress " - "information. By default the test progress is not shown." - )); - -- show_progress.add_cla_id( "--", SHOW_PROGRESS, "=" ); -+ show_progress.add_cla_id( "--", show_progress_str, "=" ); - show_progress.add_cla_id( "-", "p", " " ); - store.add( show_progress ); - - /////////////////////////////////////////////// - -- rt::option use_alt_stack( USE_ALT_STACK, ( -+ rt::option use_alt_stack( use_alt_stack_str, ( - rt::description = "Turns on/off usage of an alternative stack for signal handling.", - rt::env_var = "BOOST_TEST_USE_ALT_STACK", - rt::default_value = true, -- rt::help = "Parameter " + USE_ALT_STACK + " instructs the framework to use alternative " -+ rt::help = "Parameter " + use_alt_stack_str + " instructs the framework to use alternative " - "stack for signals processing, on platforms where they are supported. The feature " - "is enabled by default, but can be disabled using this parameter." - )); - -- use_alt_stack.add_cla_id( "--", USE_ALT_STACK, "=", true ); -+ use_alt_stack.add_cla_id( "--", use_alt_stack_str, "=", true ); - store.add( use_alt_stack ); - - /////////////////////////////////////////////// - -- rt::option wait_for_debugger( WAIT_FOR_DEBUGGER, ( -+ rt::option wait_for_debugger( wait_for_debugger_str, ( - rt::description = "Forces test module to wait for button to be pressed before starting test run.", - rt::env_var = "BOOST_TEST_WAIT_FOR_DEBUGGER", -- rt::help = "Parameter " + WAIT_FOR_DEBUGGER + " instructs the framework to pause before starting " -+ rt::help = "Parameter " + wait_for_debugger_str + " instructs the framework to pause before starting " - "test units execution, so that you can attach a debugger to running test module. By " - "default this parameters turned off." - )); - -- wait_for_debugger.add_cla_id( "--", WAIT_FOR_DEBUGGER, "=" ); -+ wait_for_debugger.add_cla_id( "--", wait_for_debugger_str, "=" ); - wait_for_debugger.add_cla_id( "-", "w", " " ); - store.add( wait_for_debugger ); - - /////////////////////////////////////////////// - -- rt::parameter help( HELP, ( -+ rt::parameter help( help_str, ( - rt::description = "Help for framework parameters.", - rt::optional_value = std::string(), - rt::value_hint = "", -- rt::help = "Parameter " + HELP + " displays help on the framework's parameters. " -+ rt::help = "Parameter " + help_str + " displays help on the framework's parameters. " - "The parameter accepts an optional argument value. If present, an argument value is " - "interpreted as a parameter name (name guessing works as well, so for example " - "--help=rand displays help on the parameter random). If the parameter name is unknown " - "or ambiguous error is reported. If argument value is absent, a summary of all " - "framework's parameter is displayed." - )); -- help.add_cla_id( "--", HELP, "=" ); -+ help.add_cla_id( "--", help_str, "=" ); - store.add( help ); - - /////////////////////////////////////////////// - -- rt::option usage( USAGE, ( -+ rt::option usage( usage_str, ( - rt::description = "Short message explaining usage of Boost.Test parameters." - )); - usage.add_cla_id( "-", "?", " " ); -@@ -638,10 +638,10 @@ register_parameters( rt::parameters_stor - - /////////////////////////////////////////////// - -- rt::option version( VERSION, ( -+ rt::option version( version_str, ( - rt::description = "Prints Boost.Test version and exits." - )); -- version.add_cla_id( "--", VERSION, " " ); -+ version.add_cla_id( "--", version_str, " " ); - store.add( version ); - } - -@@ -676,24 +676,24 @@ init( int& argc, char** argv ) - rt::finalize_arguments( s_parameters_store, s_arguments_store ); - - // Report help if requested -- if( runtime_config::get( VERSION ) ) { -+ if( runtime_config::get( version_str ) ) { - parser->version( std::cerr ); - BOOST_TEST_I_THROW( framework::nothing_to_test( boost::exit_success ) ); - } -- else if( runtime_config::get( USAGE ) ) { -+ else if( runtime_config::get( usage_str ) ) { - parser->usage( std::cerr ); - BOOST_TEST_I_THROW( framework::nothing_to_test( boost::exit_success ) ); - } -- else if( s_arguments_store.has( HELP ) ) { -- parser->help( std::cerr, s_parameters_store, runtime_config::get( HELP ) ); -+ else if( s_arguments_store.has( help_str ) ) { -+ parser->help( std::cerr, s_parameters_store, runtime_config::get( help_str ) ); - BOOST_TEST_I_THROW( framework::nothing_to_test( boost::exit_success ) ); - } - - // A bit of business logic: output_format takes precedence over log/report formats -- if( s_arguments_store.has( OUTPUT_FORMAT ) ) { -- unit_test::output_format of = s_arguments_store.get( OUTPUT_FORMAT ); -- s_arguments_store.set( REPORT_FORMAT, of ); -- s_arguments_store.set( LOG_FORMAT, of ); -+ if( s_arguments_store.has( output_format_str ) ) { -+ unit_test::output_format of = s_arguments_store.get( output_format_str ); -+ s_arguments_store.set( report_format_str, of ); -+ s_arguments_store.set( log_format_str, of ); - } - - } -@@ -747,7 +747,7 @@ argument_store() - bool - save_pattern() - { -- return runtime_config::get( SAVE_TEST_PATTERN ); -+ return runtime_config::get( save_test_pattern_str ); - } - - //____________________________________________________________________________// -Index: boost_1_63_0/boost/test/impl/framework.ipp -=================================================================== ---- boost_1_63_0.orig/boost/test/impl/framework.ipp -+++ boost_1_63_0/boost/test/impl/framework.ipp -@@ -396,7 +396,7 @@ parse_filters( test_unit_id master_tu_id - // 10. collect tu to enable and disable based on filters - bool had_selector_filter = false; - -- std::vector const& filters = runtime_config::get >( runtime_config::RUN_FILTERS ); -+ std::vector const& filters = runtime_config::get >( runtime_config::run_filters_str ); - - BOOST_TEST_FOREACH( const_string, filter, filters ) { - BOOST_TEST_SETUP_ASSERT( !filter.is_empty(), "Invalid filter specification" ); -@@ -552,7 +552,7 @@ public: - test_unit_id_list tu_to_disable; - - // 10. If there are any filters supplied, figure out lists of test units to enable/disable -- bool had_selector_filter = !runtime_config::get >( runtime_config::RUN_FILTERS ).empty() && -+ bool had_selector_filter = !runtime_config::get >( runtime_config::run_filters_str ).empty() && - parse_filters( master_tu_id, tu_to_enable, tu_to_disable ); - - // 20. Set the stage: either use default run status or disable all test units -@@ -657,7 +657,7 @@ public: - if( tu.p_type == TUT_SUITE ) { - test_suite const& ts = static_cast( tu ); - -- if( runtime_config::get( runtime_config::RANDOM_SEED ) == 0 ) { -+ if( runtime_config::get( runtime_config::random_seed_str ) == 0 ) { - typedef std::pair value_type; - - BOOST_TEST_FOREACH( value_type, chld, ts.m_ranked_children ) { -@@ -845,26 +845,26 @@ setup_loggers() - BOOST_TEST_I_TRY { - - #ifdef BOOST_TEST_SUPPORT_TOKEN_ITERATOR -- bool has_combined_logger = runtime_config::has( runtime_config::COMBINED_LOGGER ) -- && !runtime_config::get< std::vector >( runtime_config::COMBINED_LOGGER ).empty(); -+ bool has_combined_logger = runtime_config::has( runtime_config::combined_logger_str ) -+ && !runtime_config::get< std::vector >( runtime_config::combined_logger_str ).empty(); - #else - bool has_combined_logger = false; - #endif - - if( !has_combined_logger ) { -- unit_test_log.set_threshold_level( runtime_config::get( runtime_config::LOG_LEVEL ) ); -- const output_format format = runtime_config::get( runtime_config::LOG_FORMAT ); -+ unit_test_log.set_threshold_level( runtime_config::get( runtime_config::log_level_str ) ); -+ const output_format format = runtime_config::get( runtime_config::log_format_str ); - unit_test_log.set_format( format ); - - runtime_config::stream_holder& stream_logger = s_frk_state().m_log_sinks[format]; -- if( runtime_config::has( runtime_config::LOG_SINK ) ) -- stream_logger.setup( runtime_config::get( runtime_config::LOG_SINK ) ); -+ if( runtime_config::has( runtime_config::log_sink_str ) ) -+ stream_logger.setup( runtime_config::get( runtime_config::log_sink_str ) ); - unit_test_log.set_stream( stream_logger.ref() ); - } - else - { - -- const std::vector& v_output_format = runtime_config::get< std::vector >( runtime_config::COMBINED_LOGGER ) ; -+ const std::vector& v_output_format = runtime_config::get< std::vector >( runtime_config::combined_logger_str ) ; - - static const std::pair all_log_levels[] = { - std::make_pair( "all" , log_successful_tests ), -@@ -1033,26 +1033,26 @@ init( init_unit_test_func init_func, int - impl::setup_loggers(); - - // 30. Set the desired report level, format and sink -- results_reporter::set_level( runtime_config::get( runtime_config::REPORT_LEVEL ) ); -- results_reporter::set_format( runtime_config::get( runtime_config::REPORT_FORMAT ) ); -+ results_reporter::set_level( runtime_config::get( runtime_config::report_level_str ) ); -+ results_reporter::set_format( runtime_config::get( runtime_config::report_format_str ) ); - -- if( runtime_config::has( runtime_config::REPORT_SINK ) ) -- s_frk_state().m_report_sink.setup( runtime_config::get( runtime_config::REPORT_SINK ) ); -+ if( runtime_config::has( runtime_config::report_sink_str ) ) -+ s_frk_state().m_report_sink.setup( runtime_config::get( runtime_config::report_sink_str ) ); - results_reporter::set_stream( s_frk_state().m_report_sink.ref() ); - - // 40. Register default test observers - register_observer( results_collector ); - register_observer( unit_test_log ); - -- if( runtime_config::get( runtime_config::SHOW_PROGRESS ) ) { -+ if( runtime_config::get( runtime_config::show_progress_str ) ) { - progress_monitor.set_stream( std::cout ); // defaults to stdout - register_observer( progress_monitor ); - } - - // 50. Set up memory leak detection -- unsigned long detect_mem_leak = runtime_config::get( runtime_config::DETECT_MEM_LEAKS ); -+ unsigned long detect_mem_leak = runtime_config::get( runtime_config::detect_mem_leaks_str ); - if( detect_mem_leak > 0 ) { -- debug::detect_memory_leaks( true, runtime_config::get( runtime_config::REPORT_MEM_LEAKS ) ); -+ debug::detect_memory_leaks( true, runtime_config::get( runtime_config::report_mem_leaks_str ) ); - debug::break_memory_alloc( (long)detect_mem_leak ); - } - -@@ -1408,7 +1408,7 @@ run( test_unit_id id, bool continue_test - test_case_counter tcc; - traverse_test_tree( id, tcc ); - -- BOOST_TEST_SETUP_ASSERT( tcc.p_count != 0 , runtime_config::get >( runtime_config::RUN_FILTERS ).empty() -+ BOOST_TEST_SETUP_ASSERT( tcc.p_count != 0 , runtime_config::get >( runtime_config::run_filters_str ).empty() - ? BOOST_TEST_L( "test tree is empty" ) - : BOOST_TEST_L( "no test cases matching filter or all test cases were disabled" ) ); - -@@ -1428,7 +1428,7 @@ run( test_unit_id id, bool continue_test - } - } - -- unsigned seed = runtime_config::get( runtime_config::RANDOM_SEED ); -+ unsigned seed = runtime_config::get( runtime_config::random_seed_str ); - switch( seed ) { - case 0: - break; -Index: boost_1_63_0/boost/test/impl/compiler_log_formatter.ipp -=================================================================== ---- boost_1_63_0.orig/boost/test/impl/compiler_log_formatter.ipp -+++ boost_1_63_0/boost/test/impl/compiler_log_formatter.ipp -@@ -62,7 +62,7 @@ test_phase_identifier() - void - compiler_log_formatter::log_start( std::ostream& output, counter_t test_cases_amount ) - { -- m_color_output = runtime_config::get( runtime_config::COLOR_OUTPUT ); -+ m_color_output = runtime_config::get( runtime_config::color_output_str ); - - if( test_cases_amount > 0 ) - output << "Running " << test_cases_amount << " test " -Index: boost_1_63_0/boost/test/impl/plain_report_formatter.ipp -=================================================================== ---- boost_1_63_0.orig/boost/test/impl/plain_report_formatter.ipp -+++ boost_1_63_0/boost/test/impl/plain_report_formatter.ipp -@@ -83,7 +83,7 @@ void - plain_report_formatter::results_report_start( std::ostream& ostr ) - { - m_indent = 0; -- m_color_output = runtime_config::get( runtime_config::COLOR_OUTPUT ); -+ m_color_output = runtime_config::get( runtime_config::color_output_str ); - ostr << '\n'; - } - -Index: boost_1_63_0/boost/test/impl/progress_monitor.ipp -=================================================================== ---- boost_1_63_0.orig/boost/test/impl/progress_monitor.ipp -+++ boost_1_63_0/boost/test/impl/progress_monitor.ipp -@@ -124,7 +124,7 @@ progress_monitor_impl& s_pm_impl() { sta - void - progress_monitor_t::test_start( counter_t test_cases_amount ) - { -- s_pm_impl().m_color_output = runtime_config::get( runtime_config::COLOR_OUTPUT ); -+ s_pm_impl().m_color_output = runtime_config::get( runtime_config::color_output_str ); - - PM_SCOPED_COLOR(); - -Index: boost_1_63_0/boost/test/impl/unit_test_log.ipp -=================================================================== ---- boost_1_63_0.orig/boost/test/impl/unit_test_log.ipp -+++ boost_1_63_0/boost/test/impl/unit_test_log.ipp -@@ -168,7 +168,7 @@ unit_test_log_t::test_start( counter_t t - - current_logger_data.m_log_formatter->log_start( current_logger_data.stream(), test_cases_amount ); - -- if( runtime_config::get( runtime_config::BUILD_INFO ) ) -+ if( runtime_config::get( runtime_config::build_info_str ) ) - current_logger_data.m_log_formatter->log_build_info( current_logger_data.stream() ); - - current_logger_data.m_entry_in_progress = false; -Index: boost_1_63_0/boost/test/impl/unit_test_main.ipp -=================================================================== ---- boost_1_63_0.orig/boost/test/impl/unit_test_main.ipp -+++ boost_1_63_0/boost/test/impl/unit_test_main.ipp -@@ -188,7 +188,7 @@ unit_test_main( init_unit_test_func init - BOOST_TEST_I_TRY { - framework::init( init_func, argc, argv ); - -- if( runtime_config::get( runtime_config::WAIT_FOR_DEBUGGER ) ) { -+ if( runtime_config::get( runtime_config::wait_for_debugger_str ) ) { - results_reporter::get_stream() << "Press any key to continue..." << std::endl; - - // getchar is defined as a macro in uClibc. Use parenthesis to fix -@@ -199,7 +199,7 @@ unit_test_main( init_unit_test_func init - - framework::finalize_setup_phase(); - -- output_format list_cont = runtime_config::get( runtime_config::LIST_CONTENT ); -+ output_format list_cont = runtime_config::get( runtime_config::list_content_str ); - if( list_cont != unit_test::OF_INVALID ) { - if( list_cont == unit_test::OF_DOT ) { - ut_detail::dot_content_reporter reporter( results_reporter::get_stream() ); -@@ -215,7 +215,7 @@ unit_test_main( init_unit_test_func init - return boost::exit_success; - } - -- if( runtime_config::get( runtime_config::LIST_LABELS ) ) { -+ if( runtime_config::get( runtime_config::list_labels_str ) ) { - ut_detail::labels_collector collector; - - traverse_test_tree( framework::master_test_suite().p_id, collector, true ); -@@ -232,7 +232,7 @@ unit_test_main( init_unit_test_func init - - results_reporter::make_report(); - -- result_code = !runtime_config::get( runtime_config::RESULT_CODE ) -+ result_code = !runtime_config::get( runtime_config::result_code_str ) - ? boost::exit_success - : results_collector.results( framework::master_test_suite().p_id ).result_code(); - } -Index: boost_1_63_0/boost/test/impl/unit_test_monitor.ipp -=================================================================== ---- boost_1_63_0.orig/boost/test/impl/unit_test_monitor.ipp -+++ boost_1_63_0/boost/test/impl/unit_test_monitor.ipp -@@ -37,11 +37,11 @@ unit_test_monitor_t::error_level - unit_test_monitor_t::execute_and_translate( boost::function const& func, unsigned timeout ) - { - BOOST_TEST_I_TRY { -- p_catch_system_errors.value = runtime_config::get( runtime_config::CATCH_SYS_ERRORS ); -+ p_catch_system_errors.value = runtime_config::get( runtime_config::catch_sys_errors_str ); - p_timeout.value = timeout; -- p_auto_start_dbg.value = runtime_config::get( runtime_config::AUTO_START_DBG ); -- p_use_alt_stack.value = runtime_config::get( runtime_config::USE_ALT_STACK ); -- p_detect_fp_exceptions.value = runtime_config::get( runtime_config::DETECT_FP_EXCEPT ); -+ p_auto_start_dbg.value = runtime_config::get( runtime_config::auto_start_dbg_str ); -+ p_use_alt_stack.value = runtime_config::get( runtime_config::use_alt_stack_str ); -+ p_detect_fp_exceptions.value = runtime_config::get( runtime_config::detect_fp_except_str ); - - vexecute( func ); - } -Index: boost_1_63_0/libs/test/test/execution_monitor-ts/errors-handling-test.cpp -=================================================================== ---- boost_1_63_0.orig/libs/test/test/execution_monitor-ts/errors-handling-test.cpp -+++ boost_1_63_0/libs/test/test/execution_monitor-ts/errors-handling-test.cpp -@@ -185,9 +185,9 @@ BOOST_AUTO_TEST_CASE( test_errors_handli - framework::run( test ); - - unit_test_log.set_stream( std::cout ); -- unit_test_log.set_format( runtime_config::get( runtime_config::LOG_FORMAT ) ); -+ unit_test_log.set_format( runtime_config::get( runtime_config::log_format_str ) ); - -- log_level ll = runtime_config::get( runtime_config::LOG_LEVEL ); -+ log_level ll = runtime_config::get( runtime_config::log_level_str ); - unit_test_log.set_threshold_level( ll != invalid_log_level? ll : log_all_errors ); - - BOOST_CHECK( test_output.match_pattern() ); -Index: boost_1_63_0/libs/test/test/framework-ts/log-formatter-test.cpp -=================================================================== ---- boost_1_63_0.orig/libs/test/test/framework-ts/log-formatter-test.cpp -+++ boost_1_63_0/libs/test/test/framework-ts/log-formatter-test.cpp -@@ -117,7 +117,7 @@ void check( output_test_stream& output, - struct guard { - ~guard() - { -- boost::unit_test::unit_test_log.set_format( runtime_config::get( runtime_config::LOG_FORMAT ) ); -+ boost::unit_test::unit_test_log.set_format( runtime_config::get( runtime_config::log_format_str ) ); - boost::unit_test::unit_test_log.set_stream( std::cout ); - } - }; -Index: boost_1_63_0/libs/test/test/framework-ts/result-report-test.cpp -=================================================================== ---- boost_1_63_0.orig/libs/test/test/framework-ts/result-report-test.cpp -+++ boost_1_63_0/libs/test/test/framework-ts/result-report-test.cpp -@@ -101,7 +101,7 @@ struct guard { - { - results_reporter::set_stream( std::cerr ); - results_reporter::set_format( runtime_config::get( -- runtime_config::REPORT_FORMAT ) ); -+ runtime_config::report_format_str ) ); - } - }; - -Index: boost_1_63_0/libs/test/test/test-organization-ts/test_unit-order-shuffled-test.cpp -=================================================================== ---- boost_1_63_0.orig/libs/test/test/test-organization-ts/test_unit-order-shuffled-test.cpp -+++ boost_1_63_0/libs/test/test/test-organization-ts/test_unit-order-shuffled-test.cpp -@@ -109,7 +109,7 @@ struct test_tree { - BOOST_FIXTURE_TEST_CASE( test_no_seed, test_tree ) - { - // no seed set -- ut::runtime_config::s_arguments_store.set(ut::runtime_config::RANDOM_SEED, 0); -+ ut::runtime_config::s_arguments_store.set(ut::runtime_config::random_seed_str, 0); - - tu_order_collector res1 = run_tree( master ); - tu_order_collector res2 = run_tree( master ); -@@ -120,7 +120,7 @@ BOOST_FIXTURE_TEST_CASE( test_no_seed, t - BOOST_FIXTURE_TEST_CASE( test_seed_to_time, test_tree ) - { - // seed = 1 means current time is used. -- ut::runtime_config::s_arguments_store.set(ut::runtime_config::RANDOM_SEED, 1); -+ ut::runtime_config::s_arguments_store.set(ut::runtime_config::random_seed_str, 1); - - tu_order_collector res1 = run_tree( master ); - tu_order_collector res2 = run_tree( master ); -@@ -132,16 +132,16 @@ BOOST_FIXTURE_TEST_CASE( test_seed_ident - { - // seed = 1 means current time is used. - unsigned int seed = static_cast( std::time( 0 ) ); -- ut::runtime_config::s_arguments_store.set(ut::runtime_config::RANDOM_SEED, seed); -+ ut::runtime_config::s_arguments_store.set(ut::runtime_config::random_seed_str, seed); - tu_order_collector res1 = run_tree( master ); - -- ut::runtime_config::s_arguments_store.set(ut::runtime_config::RANDOM_SEED, seed); -+ ut::runtime_config::s_arguments_store.set(ut::runtime_config::random_seed_str, seed); - tu_order_collector res2 = run_tree( master ); - - BOOST_TEST( res1.m_order == res2.m_order, tt::per_element() ); - - // using time seed now -- ut::runtime_config::s_arguments_store.set(ut::runtime_config::RANDOM_SEED, 1); -+ ut::runtime_config::s_arguments_store.set(ut::runtime_config::random_seed_str, 1); - tu_order_collector res3 = run_tree( master ); - BOOST_TEST( res1.m_order != res3.m_order ); // some elements might be the same, but not the full sequences - -Index: boost_1_63_0/libs/test/test/writing-test-ts/test_tools-test.cpp -=================================================================== ---- boost_1_63_0.orig/libs/test/test/writing-test-ts/test_tools-test.cpp -+++ boost_1_63_0/libs/test/test/writing-test-ts/test_tools-test.cpp -@@ -129,9 +129,9 @@ BOOST_AUTO_TEST_CASE( name ) - ut::framework::run( impl ); \ - \ - ut::log_level ll = ut::runtime_config::get( \ -- ut::runtime_config::LOG_LEVEL ); \ -+ ut::runtime_config::log_level_str ); \ - ut::output_format lf = ut::runtime_config::get( \ -- ut::runtime_config::LOG_FORMAT ); \ -+ ut::runtime_config::log_format_str ); \ - \ - ut::unit_test_log.set_threshold_level( \ - ll != ut::invalid_log_level ? ll : ut::log_all_errors ); \ -Index: boost_1_63_0/libs/test/doc/examples/example51.run.cpp -=================================================================== ---- boost_1_63_0.orig/libs/test/doc/examples/example51.run.cpp -+++ boost_1_63_0/libs/test/doc/examples/example51.run.cpp -@@ -13,7 +13,7 @@ using namespace boost::unit_test; - - BOOST_AUTO_TEST_CASE( test_case0 ) - { -- if( runtime_config::get( runtime_config::LOG_LEVEL ) < log_warnings ) -+ if( runtime_config::get( runtime_config::log_level_str ) < log_warnings ) - unit_test_log.set_threshold_level( log_warnings ); - - BOOST_WARN( sizeof(int) > 4 ); -Index: boost_1_63_0/boost/test/unit_test_parameters.hpp -=================================================================== ---- boost_1_63_0.orig/boost/test/unit_test_parameters.hpp -+++ boost_1_63_0/boost/test/unit_test_parameters.hpp -@@ -36,31 +36,31 @@ namespace runtime_config { - // ************************************************************************** // - - // UTF parameters --BOOST_TEST_DECL extern std::string AUTO_START_DBG; --BOOST_TEST_DECL extern std::string BREAK_EXEC_PATH; --BOOST_TEST_DECL extern std::string BUILD_INFO; --BOOST_TEST_DECL extern std::string CATCH_SYS_ERRORS; --BOOST_TEST_DECL extern std::string COLOR_OUTPUT; --BOOST_TEST_DECL extern std::string DETECT_FP_EXCEPT; --BOOST_TEST_DECL extern std::string DETECT_MEM_LEAKS; --BOOST_TEST_DECL extern std::string LIST_CONTENT; --BOOST_TEST_DECL extern std::string LIST_LABELS; --BOOST_TEST_DECL extern std::string COMBINED_LOGGER; --BOOST_TEST_DECL extern std::string LOG_FORMAT; --BOOST_TEST_DECL extern std::string LOG_LEVEL; --BOOST_TEST_DECL extern std::string LOG_SINK; --BOOST_TEST_DECL extern std::string OUTPUT_FORMAT; --BOOST_TEST_DECL extern std::string RANDOM_SEED; --BOOST_TEST_DECL extern std::string REPORT_FORMAT; --BOOST_TEST_DECL extern std::string REPORT_LEVEL; --BOOST_TEST_DECL extern std::string REPORT_MEM_LEAKS; --BOOST_TEST_DECL extern std::string REPORT_SINK; --BOOST_TEST_DECL extern std::string RESULT_CODE; --BOOST_TEST_DECL extern std::string RUN_FILTERS; --BOOST_TEST_DECL extern std::string SAVE_TEST_PATTERN; --BOOST_TEST_DECL extern std::string SHOW_PROGRESS; --BOOST_TEST_DECL extern std::string USE_ALT_STACK; --BOOST_TEST_DECL extern std::string WAIT_FOR_DEBUGGER; -+BOOST_TEST_DECL extern std::string auto_start_dbg_str; -+BOOST_TEST_DECL extern std::string break_exec_path_str; -+BOOST_TEST_DECL extern std::string build_info_str; -+BOOST_TEST_DECL extern std::string catch_sys_errors_str; -+BOOST_TEST_DECL extern std::string color_output_str; -+BOOST_TEST_DECL extern std::string detect_fp_except_str; -+BOOST_TEST_DECL extern std::string detect_mem_leaks_str; -+BOOST_TEST_DECL extern std::string list_content_str; -+BOOST_TEST_DECL extern std::string list_labels_str; -+BOOST_TEST_DECL extern std::string combined_logger_str; -+BOOST_TEST_DECL extern std::string log_format_str; -+BOOST_TEST_DECL extern std::string log_level_str; -+BOOST_TEST_DECL extern std::string log_sink_str; -+BOOST_TEST_DECL extern std::string output_format_str; -+BOOST_TEST_DECL extern std::string random_seed_str; -+BOOST_TEST_DECL extern std::string report_format_str; -+BOOST_TEST_DECL extern std::string report_level_str; -+BOOST_TEST_DECL extern std::string report_mem_leaks_str; -+BOOST_TEST_DECL extern std::string report_sink_str; -+BOOST_TEST_DECL extern std::string result_code_str; -+BOOST_TEST_DECL extern std::string run_filters_str; -+BOOST_TEST_DECL extern std::string save_test_pattern_str; -+BOOST_TEST_DECL extern std::string show_progress_str; -+BOOST_TEST_DECL extern std::string use_alt_stack_str; -+BOOST_TEST_DECL extern std::string wait_for_debugger_str; - - BOOST_TEST_DECL void init( int& argc, char** argv ); -