Skip to content

Remove windows extra stunts #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Remove windows extra stunts #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f3a3d46
Remove build type from configuration step.
ObiWahn Oct 21, 2021
104dcd7
Try to make appveryor more verbose during tests.
ObiWahn Feb 2, 2020
c745bde
Make test CMakeLists.txt similar to the code in `basics`
ObiWahn Oct 21, 2021
04ad8bd
wip
ObiWahn Oct 21, 2021
4105af6
Remove code for older VS versions.
ObiWahn Oct 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,11 @@ before_build:
- if defined BINDIR (set "PATH=%BINDIR%;%PATH:C:\Program Files\Git\usr\bin;=%")
- md build_dir
- cd build_dir
- cmake -Wno-dev -DEXTLOG_TESTS=ON -DEXTLOG_EXAMPLES=ON --config "%CONFIGURATION%" -G "%GENERATOR%" ..
- cmake -Wno-dev -DEXTLOG_TESTS=ON -DEXTLOG_EXAMPLES=ON -G "%GENERATOR%" ..

build_script:
- cmake --build . --config "%CONFIGURATION%"

test_script:
- ctest -C "%CONFIGURATION%" --output-on-failure
- C:\projects\logging\build_dir\tests\Release\test-ext-logging.exe
- ctest -C "%CONFIGURATION%" --rerun-failed --output-on-failure -VV
26 changes: 6 additions & 20 deletions include/ext/logging.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,17 +50,10 @@

// 1st __VA_ARGS__ shifts the args into the correct position
// macro can not be empty because of the leading `,` (fixed with __VA_OPT__ in c++20)
#ifdef EXT_COMPILER_VC
#define EXT_LOGVARIABLE(...) \
eXT_LOG_SELECT5TH_PARAMETER( \
eXT_LOG_EXPAND(__VA_ARGS__), EXT_LOGVARIABLE4, EXT_LOGVARIABLE3, EXT_LOGVARIABLE2, EXT_LOGVARIABLE1, ) \
(eXT_LOG_EXPAND(__VA_ARGS__))
#else
#define EXT_LOGVARIABLE(...) \
eXT_LOG_SELECT5TH_PARAMETER( \
__VA_ARGS__, EXT_LOGVARIABLE4, EXT_LOGVARIABLE3, EXT_LOGVARIABLE2, EXT_LOGVARIABLE1, ) \
#define EXT_LOGVARIABLE(...) \
eXT_LOG_SELECT5TH_PARAMETER( \
__VA_ARGS__, EXT_LOGVARIABLE4, EXT_LOGVARIABLE3, EXT_LOGVARIABLE2, EXT_LOGVARIABLE1, ) \
(__VA_ARGS__)
#endif // EXT_COMPILER_VC

#define EXT_DEV_VARIABLE eXT_LOG_INTERNAL_ADD_PREFIX("$$$$", dev, EXT_LOGGING_DEFAULT_LEVEL, true)
#define EXT_DEV_IF(cond_) eXT_LOG_INTERNAL_ADD_PREFIX("$$$$", dev, EXT_LOGGING_DEFAULT_LEVEL, cond_)
Expand All @@ -80,16 +73,9 @@
#define EXT_LOGCONST2(id, macro_level_) eXT_LOG_INTERNAL_ADD_PREFIX_CONST(id, no_topic, macro_level_, true)
#define EXT_LOGCONST1(id) eXT_LOG_INTERNAL_ADD_PREFIX_CONST(id, no_topic, EXT_LOGGING_DEFAULT_LEVEL, true)

#ifdef EXT_COMPILER_VC
#define EXT_LOGCONST(...) \
eXT_LOG_SELECT5TH_PARAMETER( \
eXT_LOG_EXPAND(__VA_ARGS__), EXT_LOGCONST4, EXT_LOGCONST3, EXT_LOGCONST2, EXT_LOGCONST1, ) \
(eXT_LOG_EXPAND(__VA_ARGS__))
#else
#define EXT_LOGCONST(...) \
eXT_LOG_SELECT5TH_PARAMETER(__VA_ARGS__, EXT_LOGCONST4, EXT_LOGCONST3, EXT_LOGCONST2, EXT_LOGCONST1, ) \
(__VA_ARGS__)
#endif // EXT_COMPILER_VC
#define EXT_LOGCONST(...) \
eXT_LOG_SELECT5TH_PARAMETER(__VA_ARGS__, EXT_LOGCONST4, EXT_LOGCONST3, EXT_LOGCONST2, EXT_LOGCONST1, ) \
(__VA_ARGS__)

#define EXT_DEV eXT_LOG_INTERNAL_ADD_PREFIX_CONST("@@@@", dev, EXT_LOGGING_DEFAULT_LEVEL, true)
#define EXT_DEV_IF_CONST(cond_) eXT_LOG_INTERNAL_ADD_PREFIX_CONST("@@@@", dev, EXT_LOGGING_DEFAULT_LEVEL, cond_)
Expand Down
33 changes: 23 additions & 10 deletions tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,26 @@ foreach(test_name IN LISTS test-files${suffix}) # <- DO NOT EXPAND LIST
list(APPEND test_sources "${test_name}.cpp")
endforeach()

set(test_target "test-ext-logging${suffix}")
add_executable("${test_target}" gtest.cpp ${test_sources})
target_include_directories("${test_target}" SYSTEM PRIVATE ${gtest_SOURCE_DIR}/include)
target_link_libraries("${test_target}" ext::basics ext::logging gtest_main gtest Threads::Threads)
target_compile_options("${test_target}" PRIVATE ${ext_stone-warnings})
target_compile_definitions("${test_target}" PUBLIC EXT_CHECKED=1 EXT_IN_TEST=1)
# -- repeated calls should append which does not happen for me (cmake 3.16 on linux)
#target_compile_definitions("${test_target}" PUBLIC EXT_IN_TEST=1
add_test(NAME "${test_target}_run" COMMAND $<TARGET_FILE:${test_target}>)
set_target_properties (${test_target} PROPERTIES FOLDER tests/${test_target})
foreach(suffix IN ITEMS "")
#build one executable
set(test_sources)
foreach(test_name IN LISTS test-files${suffix}) # <- DO NOT EXPAND LIST
list(APPEND test_sources "${test_name}.cpp")
endforeach()

set(test_target "test-ext-logging${suffix}")
add_executable("${test_target}" gtest.cpp ${test_sources})
target_include_directories("${test_target}" SYSTEM PRIVATE ${gtest_SOURCE_DIR}/include)
target_link_libraries("${test_target}"
ext::basics${suffix}
ext::logging${suffix}
gtest_main gtest
Threads::Threads
)
target_compile_options("${test_target}" PRIVATE ${ext_stone-warnings})
target_compile_definitions("${test_target}" PUBLIC EXT_CHECKED=1 EXT_IN_TEST=1)
# -- repeated calls should append which does not happen for me (cmake 3.16 on linux)
#target_compile_definitions("${test_target}" PUBLIC EXT_IN_TEST=1
add_test(NAME "${test_target}_run" COMMAND $<TARGET_FILE:${test_target}>)
set_target_properties (${test_target} PROPERTIES FOLDER tests/${test_target})
endforeach()