boost_mirror/histogram
1
0
Fork 0
mirror of https://github.com/boostorg/histogram.git synced 2025-05-09 23:04:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Enable ascii ostream tests on windows (#360)

Browse Source
This commit is contained in:
Hans Dembinski 2022-07-20 10:32:56 +02:00 committed by GitHub
parent 843cacffbf
commit 8b1657553d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
test/CMakeLists.txt
View File

@ -83,6 +83,9 @@ boost_test(TYPE run SOURCES histogram_mixed_test.cpp)
boost_test(TYPE run SOURCES histogram_operators_test.cpp boost_test(TYPE run SOURCES histogram_operators_test.cpp
COMPILE_OPTIONS $<$<CXX_COMPILER_ID:MSVC>:/bigobj>) COMPILE_OPTIONS $<$<CXX_COMPILER_ID:MSVC>:/bigobj>)
boost_test(TYPE run SOURCES histogram_ostream_test.cpp) boost_test(TYPE run SOURCES histogram_ostream_test.cpp)
boost_test(TYPE run SOURCES histogram_ostream_ascii_test.cpp)
set_tests_properties(run-boost_histogram-histogram_ostream_ascii_test_cpp
PROPERTIES ENVIRONMENT "LANG=FOO;COLUMNS=20")
boost_test(TYPE run SOURCES histogram_test.cpp) boost_test(TYPE run SOURCES histogram_test.cpp)
boost_test(TYPE run SOURCES indexed_test.cpp) boost_test(TYPE run SOURCES indexed_test.cpp)
boost_test(TYPE run SOURCES storage_adaptor_test.cpp) boost_test(TYPE run SOURCES storage_adaptor_test.cpp)
@ -125,10 +128,6 @@ endif()
# boost_test(TYPE run SOURCES accumulators_serialization_test.cpp # boost_test(TYPE run SOURCES accumulators_serialization_test.cpp
# LINK_LIBRARIES Boost::serialization) # LINK_LIBRARIES Boost::serialization)
boost_test(TYPE run SOURCES histogram_ostream_ascii_test.cpp)
set_tests_properties(run-boost_histogram-histogram_ostream_ascii_test_cpp
PROPERTIES ENVIRONMENT "LANG=FOO;COLUMNS=20")
# Workaround for gcc-5 # Workaround for gcc-5
if (NOT(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6)) if (NOT(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6))

22
test/Jamfile
View File

@ -89,6 +89,8 @@ alias cxx14 :
[ run utility_test.cpp ] [ run utility_test.cpp ]
[ run issue_327_test.cpp ] [ run issue_327_test.cpp ]
[ run issue_353_test.cpp ] [ run issue_353_test.cpp ]
[ run histogram_ostream_test.cpp : : : <testing.launcher>"set LANG=UTF" ]
[ run histogram_ostream_ascii_test.cpp : : : <testing.launcher>"set LANG=FOO COLUMNS=20" ]
; ;
alias cxx17 : alias cxx17 :
@ -128,12 +130,6 @@ alias threading :
<threading>multi <threading>multi
; ;
# tests do not work on windows, because environment variables cannot be set
alias not_windows :
[ run histogram_ostream_test.cpp : : : <testing.launcher>"LANG=UTF" ]
[ run histogram_ostream_ascii_test.cpp : : : <testing.launcher>"LANG=FOO COLUMNS=20" ]
;
# warnings are off for these other boost libraries, which tend to be not warning-free # warnings are off for these other boost libraries, which tend to be not warning-free
alias accumulators : [ run boost_accumulators_support_test.cpp ] : <warnings>off ; alias accumulators : [ run boost_accumulators_support_test.cpp ] : <warnings>off ;
alias range : [ run boost_range_support_test.cpp ] : <warnings>off ; alias range : [ run boost_range_support_test.cpp ] : <warnings>off ;
@ -154,18 +150,23 @@ alias libserial :
<link>static <warnings>off <rtti>on <link>static <warnings>off <rtti>on
; ;
# helper for minimal and develop aliases
alias minimal_without_failure : cxx14 cxx17 threading odr ;
# for builds without optional boost dependencies # for builds without optional boost dependencies
alias minimal : cxx14 cxx17 failure threading ; alias minimal : minimal_without_failure failure ;
# for builds with optional boost dependencies # for builds with optional boost dependencies
alias optional_boost : accumulators range units serialization ; alias optional_boost : accumulators range units serialization ;
# all tests # all tests
alias all : minimal not_windows odr optional_boost ; alias all : minimal optional_boost ;
# all except "failure", because it is distracting during development # all except "failure", because it is distracting during development;
alias develop : odr cxx14 cxx17 threading not_windows optional_boost ; # this is called implicitly if no other alias is specified
alias develop : minimal_without_failure optional_boost ;
explicit minimal_without_failure ;
explicit minimal ; explicit minimal ;
explicit all ; explicit all ;
explicit odr ; explicit odr ;
@ -173,7 +174,6 @@ explicit cxx14 ;
explicit cxx17 ; explicit cxx17 ;
explicit failure ; explicit failure ;
explicit threading ; explicit threading ;
explicit not_windows ;
explicit accumulators ; explicit accumulators ;
explicit range ; explicit range ;
explicit units ; explicit units ;