Skip to content
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

Jump to bottom

use the catch2 test framework instead of cpplite #46 #59

Merged
merged 22 commits into from
Mar 9, 2020
Merged

use the catch2 test framework instead of cpplite #46 #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
b36e91c
no go
webern Feb 6, 2020
3579fa6
Revert "no go"
webern Feb 11, 2020
5af385b
catch
webern Feb 11, 2020
930de40
this is close
webern Feb 11, 2020
4e830d3
closer
webern Feb 11, 2020
0ef266a
passing
webern Feb 13, 2020
90ec020
Merge branch 'develop' into webern/catch
webern Feb 29, 2020
3f8156e
print fewer dots when preprocessing xml files
webern Feb 29, 2020
688e48b
better cmake messages
webern Mar 1, 2020
d81fcd5
Merge branch 'develop' into webern/catch
webern Mar 1, 2020
0784c11
add traces for undefined behavior
webern Mar 1, 2020
4cf7b93
add more traces
webern Mar 1, 2020
c79a1ee
More trace
webern Mar 1, 2020
c7b0b44
More traces
webern Mar 1, 2020
0d1442a
More traces
webern Mar 1, 2020
e2cd4a6
Count the xml document that is failing
webern Mar 1, 2020
9c65d36
Merge branch 'develop' into webern/catch
webern Mar 8, 2020
13cbda2
Merge branch 'develop' into webern/catch
webern Mar 9, 2020
26ac3ec
remove traces
webern Mar 9, 2020
1b217f9
clean up test main
webern Mar 9, 2020
3218b9a
do not do unnecessary changes for now
webern Mar 9, 2020
a03fbd2
cleanup
webern Mar 9, 2020
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: 5 additions & 0 deletions .idea/misc.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions .idea/saveactions_settings.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 7 additions & 9 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ option(
OFF
)

#set(CMAKE_BINARY_DIR "./Build")
set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR})
set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR})

Expand Down Expand Up @@ -90,14 +89,13 @@ file(WRITE ${PRIVATE_DIR}/mxtest/file/PathRoot.h

# MxTest
if(MX_BUILD_TESTS)
message("tests will be compiled")
message(STATUS "${PROJECT_NAME}:${CMAKE_CURRENT_LIST_LINE} tests will be compiled")
if(MX_BUILD_CORE_TESTS)
message("core tests will be compiled")
# add_compile_definitions(MX_COMPILE_CORE_TESTS)
message(STATUS "${PROJECT_NAME}:${CMAKE_CURRENT_LIST_LINE} core tests will be compiled")
add_definitions(-DMX_COMPILE_CORE_TESTS)
else()
message("core tests will not be compiled")
endif()
message(STATUS "${PROJECT_NAME}:${CMAKE_CURRENT_LIST_LINE} core tests will NOT be compiled")
endif()
find_package( Threads )
add_executable(MxTest ${SRC_MX_TEST_API} ${SRC_MX_TEST_CONTROL} ${SRC_MX_TEST_CORE} ${SRC_MX_TEST_FILE} ${SRC_MX_TEST_IMPL} ${SRC_MX_TEST_IMPORT} ${SRC_MX_TEST_UTILITY} ${SRC_MX_TEST_XML} ${SRC_CPUL})
target_include_directories(MxTest PRIVATE ${PRIVATE_DIR})
Expand All @@ -106,12 +104,12 @@ if(MX_BUILD_TESTS)
target_link_libraries(MxTest ${CMAKE_THREAD_LIBS_INIT})
set_property(TARGET MxTest PROPERTY CXX_STANDARD 14)
else()
message("tests will not be compiled")
message(STATUS "${PROJECT_NAME}:${CMAKE_CURRENT_LIST_LINE} tests will NOT be compiled")
endif()

# MxExamples
if(MX_BUILD_EXAMPLES)
message("examples will be compiled")
message(STATUS "${PROJECT_NAME}:${CMAKE_CURRENT_LIST_LINE} examples will be compiled")
find_package( Threads )
add_executable(MxRead ${PRIVATE_DIR}/mx/examples/Read.cpp)
add_executable(MxWrite ${PRIVATE_DIR}/mx/examples/Write.cpp)
Expand All @@ -123,5 +121,5 @@ if(MX_BUILD_EXAMPLES)
set_property(TARGET MxWrite PROPERTY CXX_STANDARD 14)
set_property(TARGET MxHide PROPERTY CXX_STANDARD 14)
else()
message("examples will not be compiled")
message(STATUS "${PROJECT_NAME}:${CMAKE_CURRENT_LIST_LINE} examples will NOT be compiled")
endif()
Loading