pool/boost
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 451173 from home:adamm:branches:devel:libraries:c_c++

Browse Source 
- recombine headers from various devel subpackages under the
  libboost_headers-devel package. Not all usage of headers that
  have compiled parts pull in their associated compiled symbols.
- general cleanup of the spec file from old, commented stuffs

OBS-URL: https://build.opensuse.org/request/show/451173
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/boost?expand=0&rev=186
This commit is contained in:
Adam Majer 2017-01-18 14:40:04 +00:00 committed by Git OBS Bridge
parent 6370b02fcc
commit 6269552c78
3 changed files with 412 additions and 446 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
boost.changes
View File

@ -4,6 +4,10 @@ Tue Jan 17 12:00:48 UTC 2017 - adam.majer@suse.de
- test_lowcase.patch: downcase Boost::Test usage of uppercase
variables. VERSION was clashing with GNU Autotools define
resulting in compilation errors of various packages.
- recombine headers from various devel subpackages under the
libboost_headers-devel package. Not all usage of headers that
have compiled parts pull in their associated compiled symbols.
- general cleanup of the spec file from old, commented stuffs
-------------------------------------------------------------------
Sun Jan 15 18:57:34 UTC 2017 - adam.majer@suse.de

450
boost.spec
View File

@ -722,7 +722,6 @@ bindings.
Summary: Development headers for Boost.Python library
Group: Development/Libraries/C and C++
PreReq: libboost_headers%{lib_appendix}-devel = %{version}
Requires: libboost_python-py2_7-%{lib_appendix}-devel = %{version}
Requires: libboost_python-py3-%{lib_appendix} = %{version}
Provides: libboost_python3-devel = %{version}
Conflicts: otherproviders(libboost_python3-devel)
@ -1009,15 +1008,6 @@ find . -type f -exec chmod u+w {} +
# then we build MPI and/or PYTHON modules for two python versions we need.
# MPI builds a python module.
cat << \EOF >.build
#%if ! %{with long_double}
#export LONG_DOUBLE_FLAGS="--disable-long-double"
#%endif
#BJAM_CONFIG="-d2 -sICU_PATH=%{_prefix}"
# export REGEX_FLAGS="--with-icu"
# export EXPAT_INCLUDE=%{_includedir} EXPAT_LIBPATH=%{_libdir}
# Python and MPI (which has python module) build seperately
# and install into special staging directories. Boost build system
# has "issues" building bindings for multiple python versions.
export PY_LIBRARIES_FLAGS="--with-python"
%if %{with build_mpi}
PY_LIBRARIES_FLAGS+=" --with-mpi"
@ -1110,12 +1100,6 @@ EOF
threading=multi link=shared runtime-link=shared stage
%endif # python3
# Build rest of boost, without python and MPI
#./bootstrap.sh $LIBRARIES_FLAGS \
# --prefix=%{_prefix} --exec-prefix=%{_bindir} \
# --libdir=%{_libdir} --includedir=%{_includedir} \
# --with-toolset=gcc
%if %{with build_docs}
cat << EOF >>user-config.jam
using xsltproc ;
@ -1166,11 +1150,6 @@ cd doc
# Read shared build instructions
. ./.build
%if %{with build_mpi}
# Set PATH, MANPATH and LD_LIBRARY_PATH for mpi
#. %{_localstatedir}/mpi-selector/data/$(rpm --qf "%{NAME}-%{VERSION}" -q openmpi).sh
%endif
%if %{with python3}
./b2 -d+2 -q --user-config=./user-config-py3.jam \
--build-type=minimal --build-dir=./python3-build \
@ -1249,30 +1228,6 @@ objdump -Ctj .text -Ctj .text %{buildroot}%{_libdir}/libboost_exception.so | \
rm %{buildroot}%{_libdir}/libboost_exception.so
rm %{buildroot}%{_libdir}/libboost_exception.so.%{version}
#pushd %{buildroot}%{_libdir}
#blibs=$(find . -name \*.so.%{version})
#echo $blibs | xargs chrpath -d
#
#for lib in ${blibs}; do
# BASE=$(basename ${lib} .so.%{version})
## SONAME_MT="$BASE-mt.so"
# ln -sf ${lib} $SONAME_MT
#done
#popd
# install the man pages
# rm -rf doc/man/man3/boost::units::operator
# mv doc/man/man3/path.3 doc/man/man3/boost::property_tree::path.3
# mv doc/man/man3/string.3 doc/man/man3/boost::container::string.3
#
# for sec in 3 7 9; do
# install -d %%buildroot/%%{_mandir}/man${sec}
# done
# pushd doc/man
# rm -f *.manifest
# tar -cf - .| tar -C %%{buildroot}/%%{_mandir} -xvf -
# popd
#install doc files
mkdir -p %{buildroot}%{my_docdir}
install -m 0644 %{SOURCE102} %{buildroot}%{my_docdir}
@ -1284,7 +1239,6 @@ ln -s %{_includedir}/boost %{buildroot}%{my_docdir}
ln -s ../LICENSE_1_0.txt %{buildroot}%{my_docdir}/libs
find %{buildroot}%{my_docdir} -name \*.py -exec chmod -x {} +
chmod -x ../boost_%{short_version}_pdf/*.pdf
#rm -f %{buildroot}%{_libdir}/*.a
#symlink dupes
%fdupes %{buildroot}
@ -1462,10 +1416,6 @@ rm -r %{buildroot}%{_includedir}/boost/context
%files -n libboost_atomic%{lib_appendix}-devel
%defattr(-, root, root, -)
%{_libdir}/libboost_atomic.so
#%{_libdir}/libboost_atomic-mt.so
%dir %{_includedir}/boost/atomic
%{_includedir}/boost/atomic/*
%{_includedir}/boost/atomic.hpp
%files -n libboost_container%{lib_appendix}
%defattr(-, root, root, -)
@ -1474,11 +1424,9 @@ rm -r %{buildroot}%{_includedir}/boost/context
%files -n libboost_container%{lib_appendix}-devel
%defattr(-, root, root, -)
%{_libdir}/libboost_container.so
#%{_libdir}/libboost_container-mt.so
%dir %{_includedir}/boost/container
%{_includedir}/boost/container/*
%if %{with build_context}
%files -n libboost_context%{lib_appendix}
%defattr(-, root, root, -)
%{_libdir}/libboost_context.so.%{version}
@ -1486,9 +1434,6 @@ rm -r %{buildroot}%{_includedir}/boost/context
%files -n libboost_context%{lib_appendix}-devel
%defattr(-, root, root, -)
%{_libdir}/libboost_context.so
#%{_libdir}/libboost_context-mt.so
%dir %{_includedir}/boost/context
%{_includedir}/boost/context/*
%files -n libboost_coroutine%{lib_appendix}
%defattr(-, root, root, -)
@ -1497,11 +1442,6 @@ rm -r %{buildroot}%{_includedir}/boost/context
%files -n libboost_coroutine%{lib_appendix}-devel
%defattr(-, root, root, -)
%{_libdir}/libboost_coroutine.so
#%{_libdir}/libboost_coroutine-mt.so
%dir %{_includedir}/boost/coroutine
%dir %{_includedir}/boost/coroutine2
%{_includedir}/boost/coroutine/*
%{_includedir}/boost/coroutine2/*
%endif # if with build_context
@ -1512,12 +1452,9 @@ rm -r %{buildroot}%{_includedir}/boost/context
%files -n libboost_date_time%{lib_appendix}-devel
%defattr(-, root, root, -)
%{_libdir}/libboost_date_time.so
#%{_libdir}/libboost_date_time-mt.so
%dir %{_includedir}/boost/date_time
%{_includedir}/boost/date_time/*
%{_includedir}/boost/date_time.hpp
%if %{with boost_fiber}
%files -n libboost_fiber%{lib_appendix}
%defattr(-, root, root, -)
%{_libdir}/libboost_fiber.so.%{version}
@ -1525,9 +1462,7 @@ rm -r %{buildroot}%{_includedir}/boost/context
%files -n libboost_fiber%{lib_appendix}-devel
%defattr(-, root, root, -)
%{_libdir}/libboost_fiber.so
#%{_libdir}/libboost_fiber-mt.so
%dir %{_includedir}/boost/fiber
%{_includedir}/boost/fiber/*
%endif # with boost_fiber
%files -n libboost_filesystem%{lib_appendix}
@ -1537,10 +1472,6 @@ rm -r %{buildroot}%{_includedir}/boost/context
%files -n libboost_filesystem%{lib_appendix}-devel
%defattr(-, root, root, -)
%{_libdir}/libboost_filesystem.so
#%{_libdir}/libboost_filesystem-mt.so
%dir %{_includedir}/boost/filesystem
%{_includedir}/boost/filesystem/*
%{_includedir}/boost/filesystem.hpp
%files -n libboost_graph%{lib_appendix}
%defattr(-, root, root, -)
@ -1549,11 +1480,6 @@ rm -r %{buildroot}%{_includedir}/boost/context
%files -n libboost_graph%{lib_appendix}-devel
%defattr(-, root, root, -)
%{_libdir}/libboost_graph.so
#%{_libdir}/libboost_graph-mt.so
%dir %{_includedir}/boost/graph
%{_includedir}/boost/graph/*
%exclude %{_includedir}/boost/graph/distributed/*
%exclude %{_includedir}/boost/graph/parallel/*
%files -n libboost_iostreams%{lib_appendix}
%defattr(-, root, root, -)
@ -1562,9 +1488,6 @@ rm -r %{buildroot}%{_includedir}/boost/context
%files -n libboost_iostreams%{lib_appendix}-devel
%defattr(-, root, root, -)
%{_libdir}/libboost_iostreams.so
#%{_libdir}/libboost_iostreams-mt.so
%dir %{_includedir}/boost/iostreams
%{_includedir}/boost/iostreams/*
%files -n libboost_log%{lib_appendix}
%defattr(-, root, root, -)
@ -1574,11 +1497,7 @@ rm -r %{buildroot}%{_includedir}/boost/context
%files -n libboost_log%{lib_appendix}-devel
%defattr(-, root, root, -)
%{_libdir}/libboost_log.so
#%{_libdir}/libboost_log-mt.so
%{_libdir}/libboost_log_setup.so
#%{_libdir}/libboost_log_setup-mt.so
%dir %{_includedir}/boost/log
%{_includedir}/boost/log/*
%files -n libboost_math%{lib_appendix}
%defattr(-, root, root, -)
@ -1592,20 +1511,11 @@ rm -r %{buildroot}%{_includedir}/boost/context
%files -n libboost_math%{lib_appendix}-devel
%defattr(-, root, root, -)
%{_libdir}/libboost_math_c99f.so
#%{_libdir}/libboost_math_c99f-mt.so
%{_libdir}/libboost_math_c99l.so
#%{_libdir}/libboost_math_c99l-mt.so
%{_libdir}/libboost_math_c99.so
#%{_libdir}/libboost_math_c99-mt.so
%{_libdir}/libboost_math_tr1f.so
#%{_libdir}/libboost_math_tr1f-mt.so
%{_libdir}/libboost_math_tr1l.so
#%{_libdir}/libboost_math_tr1l-mt.so
%{_libdir}/libboost_math_tr1.so
#%{_libdir}/libboost_math_tr1-mt.so
%dir %{_includedir}/boost/math
%{_includedir}/boost/math/*
%{_includedir}/boost/math_fwd.hpp
%if %{with build_mpi}
%files -n libboost_mpi%{lib_appendix}
@ -1615,10 +1525,6 @@ rm -r %{buildroot}%{_includedir}/boost/context
%files -n libboost_mpi%{lib_appendix}-devel
%defattr(-, root, root, -)
%{_libdir}/libboost_mpi.so
#%{_libdir}/libboost_mpi-mt.so
%dir %{_includedir}/boost/mpi
%{_includedir}/boost/mpi/*
%{_includedir}/boost/mpi.hpp
%files -n libboost_graph_parallel%{lib_appendix}
%defattr(-,root,root)
@ -1627,11 +1533,6 @@ rm -r %{buildroot}%{_includedir}/boost/context
%files -n libboost_graph_parallel%{lib_appendix}-devel
%defattr(-,root,root)
%{_libdir}/libboost_graph_parallel.so
#%{_libdir}/libboost_graph_parallel-mt.so
%dir %{_includedir}/boost/graph/distributed
%dir %{_includedir}/boost/graph/parallel
%{_includedir}/boost/graph/distributed/*
%{_includedir}/boost/graph/parallel/*
%files -n libboost_mpi_python-py2_7-%{lib_appendix}
%defattr(-,root,root)
@ -1682,11 +1583,7 @@ rm -r %{buildroot}%{_includedir}/boost/context
%defattr(-, root, root, -)
%{_libdir}/libboost_prg_exec_monitor.so
%{_libdir}/libboost_test_exec_monitor.so
#%{_libdir}/libboost_prg_exec_monitor-mt.so
%{_libdir}/libboost_unit_test_framework.so
#%{_libdir}/libboost_unit_test_framework-mt.so
%dir %{_includedir}/boost/test
%{_includedir}/boost/test/*
%files -n libboost_program_options%{lib_appendix}
%defattr(-, root, root, -)
@ -1695,10 +1592,6 @@ rm -r %{buildroot}%{_includedir}/boost/context
%files -n libboost_program_options%{lib_appendix}-devel
%defattr(-, root, root, -)
%{_libdir}/libboost_program_options.so
#%{_libdir}/libboost_program_options-mt.so
%dir %{_includedir}/boost/program_options
%{_includedir}/boost/program_options/*
%{_includedir}/boost/program_options.hpp
%files -n libboost_python-py2_7-%{lib_appendix}
%defattr(-, root, root, -)
@ -1708,10 +1601,6 @@ rm -r %{buildroot}%{_includedir}/boost/context
%defattr(-, root, root, -)
%{_libdir}/libboost_python.so
%{_libdir}/libboost_python-py2_7.so
#%{_libdir}/libboost_python-mt.so
%dir %{_includedir}/boost/python
%{_includedir}/boost/python/*
%{_includedir}/boost/python.hpp
%if %{with python3}
%files -n libboost_python-py3-%{lib_appendix}
@ -1722,7 +1611,6 @@ rm -r %{buildroot}%{_includedir}/boost/context
%defattr(-, root, root, -)
%{_libdir}/libboost_python3.so
%{_libdir}/libboost_python-py3.so
#%{_libdir}/libboost_python3-mt.so
%endif # with python3
@ -1734,11 +1622,7 @@ rm -r %{buildroot}%{_includedir}/boost/context
%files -n libboost_serialization%{lib_appendix}-devel
%defattr(-, root, root, -)
%{_libdir}/libboost_serialization.so
#%{_libdir}/libboost_serialization-mt.so
%{_libdir}/libboost_wserialization.so
#%{_libdir}/libboost_wserialization-mt.so
%dir %{_includedir}/boost/serialization
%{_includedir}/boost/serialization/*
%files -n libboost_signals%{lib_appendix}
%defattr(-, root, root, -)
@ -1747,11 +1631,6 @@ rm -r %{buildroot}%{_includedir}/boost/context
%files -n libboost_signals%{lib_appendix}-devel
%defattr(-, root, root, -)
%{_libdir}/libboost_signals.so
#%{_libdir}/libboost_signals-mt.so
%dir %{_includedir}/boost/signals
%{_includedir}/boost/signals/*
%{_includedir}/boost/signal.hpp
%{_includedir}/boost/signals.hpp
%files -n libboost_system%{lib_appendix}
%defattr(-, root, root, -)
@ -1760,9 +1639,6 @@ rm -r %{buildroot}%{_includedir}/boost/context
%files -n libboost_system%{lib_appendix}-devel
%defattr(-, root, root, -)
%{_libdir}/libboost_system.so
#%{_libdir}/libboost_system-mt.so
%dir %{_includedir}/boost/system
%{_includedir}/boost/system/*
%files -n libboost_thread%{lib_appendix}
%defattr(-, root, root, -)
@ -1771,10 +1647,6 @@ rm -r %{buildroot}%{_includedir}/boost/context
%files -n libboost_thread%{lib_appendix}-devel
%defattr(-, root, root, -)
%{_libdir}/libboost_thread.so
#%{_libdir}/libboost_thread-mt.so
%dir %{_includedir}/boost/thread
%{_includedir}/boost/thread/*
%{_includedir}/boost/thread.hpp
%files -n libboost_wave%{lib_appendix}
%defattr(-, root, root, -)
@ -1783,10 +1655,6 @@ rm -r %{buildroot}%{_includedir}/boost/context
%files -n libboost_wave%{lib_appendix}-devel
%defattr(-, root, root, -)
%{_libdir}/libboost_wave.so
#%{_libdir}/libboost_wave-mt.so
%dir %{_includedir}/boost/wave
%{_includedir}/boost/wave/*
%{_includedir}/boost/wave.hpp
%files -n libboost_regex%{lib_appendix}
%defattr(-, root, root, -)
@ -1795,12 +1663,6 @@ rm -r %{buildroot}%{_includedir}/boost/context
%files -n libboost_regex%{lib_appendix}-devel
%defattr(-, root, root, -)
%{_libdir}/libboost_regex.so
#%{_libdir}/libboost_regex-mt.so
%dir %{_includedir}/boost/regex
%{_includedir}/boost/regex/*
%{_includedir}/boost/regex.h
%{_includedir}/boost/regex.hpp
%{_includedir}/boost/regex_fwd.hpp
%files -n libboost_random%{lib_appendix}
%defattr(-, root, root, -)
@ -1809,10 +1671,6 @@ rm -r %{buildroot}%{_includedir}/boost/context
%files -n libboost_random%{lib_appendix}-devel
%defattr(-, root, root, -)
%{_libdir}/libboost_random.so
#%{_libdir}/libboost_random-mt.so
%dir %{_includedir}/boost/random
%{_includedir}/boost/random/*
%{_includedir}/boost/random.hpp
%files -n libboost_chrono%{lib_appendix}
%defattr(-, root, root, -)
@ -1821,10 +1679,6 @@ rm -r %{buildroot}%{_includedir}/boost/context
%files -n libboost_chrono%{lib_appendix}-devel
%defattr(-, root, root, -)
%{_libdir}/libboost_chrono.so
#%{_libdir}/libboost_chrono-mt.so
%dir %{_includedir}/boost/chrono
%{_includedir}/boost/chrono/*
%{_includedir}/boost/chrono.hpp
%files -n libboost_locale%{lib_appendix}
%defattr(-, root, root, -)
@ -1833,10 +1687,6 @@ rm -r %{buildroot}%{_includedir}/boost/context
%files -n libboost_locale%{lib_appendix}-devel
%defattr(-, root, root, -)
%{_libdir}/libboost_locale.so
#%{_libdir}/libboost_locale-mt.so
%dir %{_includedir}/boost/locale
%{_includedir}/boost/locale/*
%{_includedir}/boost/locale.hpp
%files -n libboost_timer%{lib_appendix}
%defattr(-, root, root, -)
@ -1845,10 +1695,6 @@ rm -r %{buildroot}%{_includedir}/boost/context
%files -n libboost_timer%{lib_appendix}-devel
%defattr(-, root, root, -)
%{_libdir}/libboost_timer.so
#%{_libdir}/libboost_timer-mt.so
%dir %{_includedir}/boost/timer
%{_includedir}/boost/timer/*
%{_includedir}/boost/timer.hpp
%files -n libboost_type_erasure%{lib_appendix}
%defattr(-, root, root, -)
@ -1857,299 +1703,11 @@ rm -r %{buildroot}%{_includedir}/boost/context
%files -n libboost_type_erasure%{lib_appendix}-devel
%defattr(-, root, root, -)
%{_libdir}/libboost_type_erasure.so
#%{_libdir}/libboost_type_erasure-mt.so
%dir %{_includedir}/boost/type_erasure
%{_includedir}/boost/type_erasure/*
%files -n libboost_headers%{lib_appendix}-devel
%defattr(-, root, root, -)
%dir %{_includedir}/boost
%dir %{_includedir}/boost/accumulators
%{_includedir}/boost/accumulators/*
%dir %{_includedir}/boost/algorithm
%{_includedir}/boost/algorithm/*
%dir %{_includedir}/boost/align
%{_includedir}/boost/align/*
%{_includedir}/boost/align.hpp
%{_includedir}/boost/aligned_storage.hpp
%{_includedir}/boost/any.hpp
%dir %{_includedir}/boost/archive
%{_includedir}/boost/archive/*
%{_includedir}/boost/array.hpp
%dir %{_includedir}/boost/asio
%{_includedir}/boost/asio/*
%{_includedir}/boost/asio.hpp
%{_includedir}/boost/assert.hpp
%dir %{_includedir}/boost/assign
%{_includedir}/boost/assign/*
%{_includedir}/boost/assign.hpp
%dir %{_includedir}/boost/bimap
%{_includedir}/boost/bimap/*
%{_includedir}/boost/bimap.hpp
%dir %{_includedir}/boost/bind
%{_includedir}/boost/bind/*
%{_includedir}/boost/bind.hpp
%{_includedir}/boost/blank.hpp
%{_includedir}/boost/blank_fwd.hpp
%{_includedir}/boost/call_traits.hpp
%{_includedir}/boost/cast.hpp
%{_includedir}/boost/cerrno.hpp
%{_includedir}/boost/checked_delete.hpp
%dir %{_includedir}/boost/circular_buffer
%{_includedir}/boost/circular_buffer/*
%{_includedir}/boost/circular_buffer.hpp
%{_includedir}/boost/circular_buffer_fwd.hpp
%dir %{_includedir}/boost/compatibility
%{_includedir}/boost/compatibility/*
%{_includedir}/boost/compressed_pair.hpp
%dir %{_includedir}/boost/compute
%{_includedir}/boost/compute/*
%{_includedir}/boost/compute.hpp
%dir %{_includedir}/boost/concept
%{_includedir}/boost/concept/*
%{_includedir}/boost/concept_archetype.hpp
%dir %{_includedir}/boost/concept_check
%{_includedir}/boost/concept_check/*
%{_includedir}/boost/concept_check.hpp
%dir %{_includedir}/boost/config
%{_includedir}/boost/config/*
%{_includedir}/boost/config.hpp
%dir %{_includedir}/boost/convert
%{_includedir}/boost/convert/*
%{_includedir}/boost/convert.hpp
%dir %{_includedir}/boost/core
%{_includedir}/boost/core/*
%{_includedir}/boost/crc.hpp
%{_includedir}/boost/cregex.hpp
%{_includedir}/boost/cstdfloat.hpp
%{_includedir}/boost/cstdint.hpp
%{_includedir}/boost/cstdlib.hpp
%{_includedir}/boost/current_function.hpp
%{_includedir}/boost/cxx11_char_types.hpp
%dir %{_includedir}/boost/detail
%{_includedir}/boost/detail/*
%dir %{_includedir}/boost/dll
%{_includedir}/boost/dll/*
%{_includedir}/boost/dll.hpp
%dir %{_includedir}/boost/dynamic_bitset
%{_includedir}/boost/dynamic_bitset/*
%{_includedir}/boost/dynamic_bitset.hpp
%{_includedir}/boost/dynamic_bitset_fwd.hpp
%{_includedir}/boost/enable_shared_from_this.hpp
%dir %{_includedir}/boost/endian
%{_includedir}/boost/endian/*
%dir %{_includedir}/boost/exception
%{_includedir}/boost/exception/*
%{_includedir}/boost/exception_ptr.hpp
%dir %{_includedir}/boost/flyweight
%{_includedir}/boost/flyweight/*
%{_includedir}/boost/flyweight.hpp
%{_includedir}/boost/foreach.hpp
%{_includedir}/boost/foreach_fwd.hpp
%dir %{_includedir}/boost/format
%{_includedir}/boost/format/*
%{_includedir}/boost/format.hpp
%dir %{_includedir}/boost/function
%{_includedir}/boost/function/*
%{_includedir}/boost/function.hpp
%{_includedir}/boost/function_equal.hpp
%{_includedir}/boost/function_output_iterator.hpp
%dir %{_includedir}/boost/function_types
%{_includedir}/boost/function_types/*
%dir %{_includedir}/boost/functional
%{_includedir}/boost/functional/*
%{_includedir}/boost/functional.hpp
%dir %{_includedir}/boost/fusion
%{_includedir}/boost/fusion/*
%{_includedir}/boost/generator_iterator.hpp
%dir %{_includedir}/boost/geometry
%{_includedir}/boost/geometry/*
%{_includedir}/boost/geometry.hpp
%{_includedir}/boost/get_pointer.hpp
%dir %{_includedir}/boost/gil
%{_includedir}/boost/gil/*
%dir %{_includedir}/boost/hana
%{_includedir}/boost/hana/*
%{_includedir}/boost/hana.hpp
%dir %{_includedir}/boost/heap
%{_includedir}/boost/heap/*
%dir %{_includedir}/boost/icl
%{_includedir}/boost/icl/*
%{_includedir}/boost/implicit_cast.hpp
%{_includedir}/boost/indirect_reference.hpp
%dir %{_includedir}/boost/integer
%{_includedir}/boost/integer/*
%{_includedir}/boost/integer.hpp
%{_includedir}/boost/integer_fwd.hpp
%{_includedir}/boost/integer_traits.hpp
%{_includedir}/boost/iterator_adaptors.hpp
%dir %{_includedir}/boost/interprocess
%{_includedir}/boost/interprocess/*
%dir %{_includedir}/boost/intrusive
%{_includedir}/boost/intrusive/*
%{_includedir}/boost/intrusive_ptr.hpp
%dir %{_includedir}/boost/io
%dir %{_includedir}/boost/io/detail
%{_includedir}/boost/io/detail/quoted_manip.hpp
%{_includedir}/boost/io/ios_state.hpp
%{_includedir}/boost/io_fwd.hpp
%{_includedir}/boost/is_placeholder.hpp
%dir %{_includedir}/boost/iterator
%{_includedir}/boost/iterator/*
%{_includedir}/boost/iterator.hpp
%dir %{_includedir}/boost/lambda
%{_includedir}/boost/lambda/*
%{_includedir}/boost/last_value.hpp
%dir %{_includedir}/boost/lexical_cast
%{_includedir}/boost/lexical_cast/*
%{_includedir}/boost/lexical_cast.hpp
%{_includedir}/boost/limits.hpp
%dir %{_includedir}/boost/local_function
%{_includedir}/boost/local_function/*
%{_includedir}/boost/local_function.hpp
%dir %{_includedir}/boost/lockfree
%{_includedir}/boost/lockfree/*
%dir %{_includedir}/boost/logic
%{_includedir}/boost/logic/*
%{_includedir}/boost/make_default.hpp
%{_includedir}/boost/make_shared.hpp
%{_includedir}/boost/make_unique.hpp
%{_includedir}/boost/mem_fn.hpp
%{_includedir}/boost/memory_order.hpp
%dir %{_includedir}/boost/metaparse
%{_includedir}/boost/metaparse/*
%{_includedir}/boost/metaparse.hpp
%dir %{_includedir}/boost/move
%{_includedir}/boost/move/*
%dir %{_includedir}/boost/mpl
%{_includedir}/boost/mpl/*
%dir %{_includedir}/boost/msm
%{_includedir}/boost/msm/*
%dir %{_includedir}/boost/multi_array
%{_includedir}/boost/multi_array/*
%{_includedir}/boost/multi_array.hpp
%dir %{_includedir}/boost/multi_index
%{_includedir}/boost/multi_index/*
%{_includedir}/boost/multi_index_container.hpp
%{_includedir}/boost/multi_index_container_fwd.hpp
%dir %{_includedir}/boost/multiprecision
%{_includedir}/boost/multiprecision/*
%{_includedir}/boost/next_prior.hpp
%{_includedir}/boost/non_type.hpp
%{_includedir}/boost/noncopyable.hpp
%{_includedir}/boost/nondet_random.hpp
%{_includedir}/boost/none.hpp
%{_includedir}/boost/none_t.hpp
%dir %{_includedir}/boost/numeric
%{_includedir}/boost/numeric/*
%{_includedir}/boost/operators.hpp
%{_includedir}/boost/operators_v1.hpp
%dir %{_includedir}/boost/optional
%{_includedir}/boost/optional/*
%{_includedir}/boost/optional.hpp
%dir %{_includedir}/boost/parameter
%{_includedir}/boost/parameter/*
%{_includedir}/boost/parameter.hpp
%dir %{_includedir}/boost/pending
%{_includedir}/boost/pending/*
%dir %{_includedir}/boost/phoenix
%{_includedir}/boost/phoenix/*
%{_includedir}/boost/phoenix.hpp
%{_includedir}/boost/pointee.hpp
%{_includedir}/boost/pointer_cast.hpp
%{_includedir}/boost/pointer_to_other.hpp
%dir %{_includedir}/boost/polygon
%{_includedir}/boost/polygon/*
%{_includedir}/boost/polymorphic_cast.hpp
%{_includedir}/boost/polymorphic_pointer_cast.hpp
%dir %{_includedir}/boost/pool
%{_includedir}/boost/pool/*
%dir %{_includedir}/boost/predef
%{_includedir}/boost/predef/*
%{_includedir}/boost/predef.h
%dir %{_includedir}/boost/preprocessor
%{_includedir}/boost/preprocessor/*
%{_includedir}/boost/preprocessor.hpp
%{_includedir}/boost/progress.hpp
%dir %{_includedir}/boost/property_map
%{_includedir}/boost/property_map/*
%dir %{_includedir}/boost/property_tree
%{_includedir}/boost/property_tree/*
%dir %{_includedir}/boost/proto
%{_includedir}/boost/proto/*
%dir %{_includedir}/boost/ptr_container
%{_includedir}/boost/ptr_container/*
%dir %{_includedir}/boost/qvm
%{_includedir}/boost/qvm/*
%dir %{_includedir}/boost/range
%{_includedir}/boost/range/*
%{_includedir}/boost/range.hpp
%dir %{_includedir}/boost/ratio
%{_includedir}/boost/ratio/*
%{_includedir}/boost/ratio.hpp
%{_includedir}/boost/rational.hpp
%{_includedir}/boost/ref.hpp
%{_includedir}/boost/scope_exit.hpp
%{_includedir}/boost/scoped_array.hpp
%{_includedir}/boost/scoped_ptr.hpp
%{_includedir}/boost/shared_array.hpp
%{_includedir}/boost/shared_container_iterator.hpp
%{_includedir}/boost/shared_ptr.hpp
%dir %{_includedir}/boost/signals2
%{_includedir}/boost/signals2/*
%{_includedir}/boost/signals2.hpp
%dir %{_includedir}/boost/smart_ptr
%{_includedir}/boost/smart_ptr/*
%{_includedir}/boost/smart_ptr.hpp
%dir %{_includedir}/boost/sort
%{_includedir}/boost/sort/*
%dir %{_includedir}/boost/spirit
%{_includedir}/boost/spirit/*
%{_includedir}/boost/spirit.hpp
%dir %{_includedir}/boost/statechart
%{_includedir}/boost/statechart/*
%{_includedir}/boost/static_assert.hpp
%{_includedir}/boost/swap.hpp
%{_includedir}/boost/throw_exception.hpp
%{_includedir}/boost/token_functions.hpp
%{_includedir}/boost/token_iterator.hpp
%{_includedir}/boost/tokenizer.hpp
%dir %{_includedir}/boost/tr1
%{_includedir}/boost/tr1/*
%dir %{_includedir}/boost/tti
%{_includedir}/boost/tti/*
%dir %{_includedir}/boost/tuple
%{_includedir}/boost/tuple/*
%{_includedir}/boost/type.hpp
%dir %{_includedir}/boost/type_index
%{_includedir}/boost/type_index/*
%{_includedir}/boost/type_index.hpp
%dir %{_includedir}/boost/type_traits
%{_includedir}/boost/type_traits/*
%{_includedir}/boost/type_traits.hpp
%dir %{_includedir}/boost/typeof
%{_includedir}/boost/typeof/*
%dir %{_includedir}/boost/units
%{_includedir}/boost/units/*
%dir %{_includedir}/boost/unordered
%{_includedir}/boost/unordered/*
%{_includedir}/boost/unordered_map.hpp
%{_includedir}/boost/unordered_set.hpp
%dir %{_includedir}/boost/utility
%{_includedir}/boost/utility/*
%{_includedir}/boost/utility.hpp
%dir %{_includedir}/boost/uuid
%{_includedir}/boost/uuid/*
%dir %{_includedir}/boost/variant
%{_includedir}/boost/variant/*
%{_includedir}/boost/variant.hpp
%{_includedir}/boost/version.hpp
%{_includedir}/boost/visit_each.hpp
%dir %{_includedir}/boost/vmd
%{_includedir}/boost/vmd/*
%{_includedir}/boost/weak_ptr.hpp
%dir %{_includedir}/boost/xpressive
%{_includedir}/boost/xpressive/*
%{_includedir}/boost/*
%files -n %{package_name}-devel
%defattr(-, root, root, -)

404
test_lowcase.patch
View File

@ -1,4 +1,5 @@
Author: Adam Majer <amajer@suse.de>
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
@ -652,3 +653,406 @@ Index: boost_1_63_0/boost/test/impl/unit_test_parameters.ipp
}
//____________________________________________________________________________//
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<std::string> const& filters = runtime_config::get<std::vector<std::string> >( runtime_config::RUN_FILTERS );
+ std::vector<std::string> const& filters = runtime_config::get<std::vector<std::string> >( 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<std::vector<std::string> >( runtime_config::RUN_FILTERS ).empty() &&
+ bool had_selector_filter = !runtime_config::get<std::vector<std::string> >( 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<test_suite const&>( tu );
- if( runtime_config::get<unsigned>( runtime_config::RANDOM_SEED ) == 0 ) {
+ if( runtime_config::get<unsigned>( runtime_config::random_seed_str ) == 0 ) {
typedef std::pair<counter_t,test_unit_id> 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<std::string> >( runtime_config::COMBINED_LOGGER ).empty();
+ bool has_combined_logger = runtime_config::has( runtime_config::combined_logger_str )
+ && !runtime_config::get< std::vector<std::string> >( 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<log_level>( runtime_config::LOG_LEVEL ) );
- const output_format format = runtime_config::get<output_format>( runtime_config::LOG_FORMAT );
+ unit_test_log.set_threshold_level( runtime_config::get<log_level>( runtime_config::log_level_str ) );
+ const output_format format = runtime_config::get<output_format>( 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<std::string>( runtime_config::LOG_SINK ) );
+ if( runtime_config::has( runtime_config::log_sink_str ) )
+ stream_logger.setup( runtime_config::get<std::string>( runtime_config::log_sink_str ) );
unit_test_log.set_stream( stream_logger.ref() );
}
else
{
- const std::vector<std::string>& v_output_format = runtime_config::get< std::vector<std::string> >( runtime_config::COMBINED_LOGGER ) ;
+ const std::vector<std::string>& v_output_format = runtime_config::get< std::vector<std::string> >( runtime_config::combined_logger_str ) ;
static const std::pair<const char*, log_level> 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<report_level>( runtime_config::REPORT_LEVEL ) );
- results_reporter::set_format( runtime_config::get<output_format>( runtime_config::REPORT_FORMAT ) );
+ results_reporter::set_level( runtime_config::get<report_level>( runtime_config::report_level_str ) );
+ results_reporter::set_format( runtime_config::get<output_format>( runtime_config::report_format_str ) );
- if( runtime_config::has( runtime_config::REPORT_SINK ) )
- s_frk_state().m_report_sink.setup( runtime_config::get<std::string>( runtime_config::REPORT_SINK ) );
+ if( runtime_config::has( runtime_config::report_sink_str ) )
+ s_frk_state().m_report_sink.setup( runtime_config::get<std::string>( 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<bool>( runtime_config::SHOW_PROGRESS ) ) {
+ if( runtime_config::get<bool>( 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<unsigned long>( runtime_config::DETECT_MEM_LEAKS );
+ unsigned long detect_mem_leak = runtime_config::get<unsigned long>( runtime_config::detect_mem_leaks_str );
if( detect_mem_leak > 0 ) {
- debug::detect_memory_leaks( true, runtime_config::get<std::string>( runtime_config::REPORT_MEM_LEAKS ) );
+ debug::detect_memory_leaks( true, runtime_config::get<std::string>( 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<std::vector<std::string> >( runtime_config::RUN_FILTERS ).empty()
+ BOOST_TEST_SETUP_ASSERT( tcc.p_count != 0 , runtime_config::get<std::vector<std::string> >( 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<unsigned>( runtime_config::RANDOM_SEED );
+ unsigned seed = runtime_config::get<unsigned>( 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<bool>( runtime_config::COLOR_OUTPUT );
+ m_color_output = runtime_config::get<bool>( 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<bool>( runtime_config::COLOR_OUTPUT );
+ m_color_output = runtime_config::get<bool>( 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<bool>( runtime_config::COLOR_OUTPUT );
+ s_pm_impl().m_color_output = runtime_config::get<bool>( 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<bool>( runtime_config::BUILD_INFO ) )
+ if( runtime_config::get<bool>( 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<bool>( runtime_config::WAIT_FOR_DEBUGGER ) ) {
+ if( runtime_config::get<bool>( 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<output_format>( runtime_config::LIST_CONTENT );
+ output_format list_cont = runtime_config::get<output_format>( 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<bool>( runtime_config::LIST_LABELS ) ) {
+ if( runtime_config::get<bool>( 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<bool>( runtime_config::RESULT_CODE )
+ result_code = !runtime_config::get<bool>( 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<void ()> const& func, unsigned timeout )
{
BOOST_TEST_I_TRY {
- p_catch_system_errors.value = runtime_config::get<bool>( runtime_config::CATCH_SYS_ERRORS );
+ p_catch_system_errors.value = runtime_config::get<bool>( runtime_config::catch_sys_errors_str );
p_timeout.value = timeout;
- p_auto_start_dbg.value = runtime_config::get<bool>( runtime_config::AUTO_START_DBG );
- p_use_alt_stack.value = runtime_config::get<bool>( runtime_config::USE_ALT_STACK );
- p_detect_fp_exceptions.value = runtime_config::get<bool>( runtime_config::DETECT_FP_EXCEPT );
+ p_auto_start_dbg.value = runtime_config::get<bool>( runtime_config::auto_start_dbg_str );
+ p_use_alt_stack.value = runtime_config::get<bool>( runtime_config::use_alt_stack_str );
+ p_detect_fp_exceptions.value = runtime_config::get<bool>( 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<output_format>( runtime_config::LOG_FORMAT ) );
+ unit_test_log.set_format( runtime_config::get<output_format>( runtime_config::log_format_str ) );
- log_level ll = runtime_config::get<log_level>( runtime_config::LOG_LEVEL );
+ log_level ll = runtime_config::get<log_level>( 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<output_format>( runtime_config::LOG_FORMAT ) );
+ boost::unit_test::unit_test_log.set_format( runtime_config::get<output_format>( 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<output_format>(
- 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<unsigned int>(ut::runtime_config::RANDOM_SEED, 0);
+ ut::runtime_config::s_arguments_store.set<unsigned int>(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<unsigned int>(ut::runtime_config::RANDOM_SEED, 1);
+ ut::runtime_config::s_arguments_store.set<unsigned int>(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<unsigned int>( std::time( 0 ) );
- ut::runtime_config::s_arguments_store.set<unsigned int>(ut::runtime_config::RANDOM_SEED, seed);
+ ut::runtime_config::s_arguments_store.set<unsigned int>(ut::runtime_config::random_seed_str, seed);
tu_order_collector res1 = run_tree( master );
- ut::runtime_config::s_arguments_store.set<unsigned int>(ut::runtime_config::RANDOM_SEED, seed);
+ ut::runtime_config::s_arguments_store.set<unsigned int>(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<unsigned int>(ut::runtime_config::RANDOM_SEED, 1);
+ ut::runtime_config::s_arguments_store.set<unsigned int>(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::log_level>( \
- ut::runtime_config::LOG_LEVEL ); \
+ ut::runtime_config::log_level_str ); \
ut::output_format lf = ut::runtime_config::get<ut::output_format>( \
- 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<log_level>( runtime_config::LOG_LEVEL ) < log_warnings )
+ if( runtime_config::get<log_level>( 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 );