3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2024-11-23 05:46:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #207 from Fraser999/list_tests_issue

Browse Source 
List tests issue
This commit is contained in:
Phil Nash 2013-11-07 03:11:19 -08:00
commit 0712bbb251
2 changed files with 29 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/internal/catch_list.hpp
View File

@ -86,12 +86,13 @@ namespace Catch {
std::cout << nameCol; std::cout << nameCol;
} }
if( i < tagsWrapper.size() && !tagsWrapper[i].empty() ) { if( i < tagsWrapper.size() && !tagsWrapper[i].empty() ) {
size_t padLen( maxNameLen > nameCol.size() ? maxNameLen - nameCol.size() : 0 );
if( i == 0 ) { if( i == 0 ) {
Colour colourGuard( Colour::SecondaryText ); Colour colourGuard( Colour::SecondaryText );
std::cout << " " << std::string( maxNameLen - nameCol.size(), '.' ) << " "; std::cout << " " << std::string( padLen, '.' ) << " ";
} }
else { else {
std::cout << std::string( maxNameLen - nameCol.size(), ' ' ) << " "; std::cout << std::string( padLen, ' ' ) << " ";
} }
std::cout << tagsWrapper[i]; std::cout << tagsWrapper[i];
} }

49
projects/CMake/CMakeLists.txt
View File

@ -1,37 +1,40 @@
cmake_minimum_required(VERSION 2.8) cmake_minimum_required(VERSION 2.8)
project(Catch C CXX) project(Catch)
message("configure: Catch/SelfTest")
# define some folders # define some folders
set(CATCH_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../..") get_filename_component(CATCH_DIR "${CMAKE_CURRENT_SOURCE_DIR}" PATH)
get_filename_component(CATCH_DIR "${CATCH_DIR}" PATH)
set(SELF_TEST_DIR ${CATCH_DIR}/projects/SelfTest) set(SELF_TEST_DIR ${CATCH_DIR}/projects/SelfTest)
set(SCRIPTS_DIR ${CATCH_DIR}/scripts)
# define the sources of the self test # define the sources of the self test
set( set(SOURCES
SOURCES ${SELF_TEST_DIR}/ApproxTests.cpp
${SELF_TEST_DIR}/ApproxTests.cpp ${SELF_TEST_DIR}/BDDTests.cpp
${SELF_TEST_DIR}/BDDTests.cpp ${SELF_TEST_DIR}/catch_self_test.cpp
${SELF_TEST_DIR}/catch_self_test.cpp ${SELF_TEST_DIR}/ClassTests.cpp
${SELF_TEST_DIR}/ClassTests.cpp ${SELF_TEST_DIR}/CmdLineTests.cpp
${SELF_TEST_DIR}/CmdLineTests.cpp ${SELF_TEST_DIR}/ConditionTests.cpp
${SELF_TEST_DIR}/ConditionTests.cpp ${SELF_TEST_DIR}/ExceptionTests.cpp
${SELF_TEST_DIR}/ExceptionTests.cpp ${SELF_TEST_DIR}/GeneratorTests.cpp
${SELF_TEST_DIR}/GeneratorTests.cpp ${SELF_TEST_DIR}/MessageTests.cpp
${SELF_TEST_DIR}/MessageTests.cpp ${SELF_TEST_DIR}/MiscTests.cpp
${SELF_TEST_DIR}/MiscTests.cpp ${SELF_TEST_DIR}/SectionTrackerTests.cpp
${SELF_TEST_DIR}/SectionTrackerTests.cpp ${SELF_TEST_DIR}/TestMain.cpp
${SELF_TEST_DIR}/TestMain.cpp ${SELF_TEST_DIR}/TrickyTests.cpp
${SELF_TEST_DIR}/TrickyTests.cpp ${SELF_TEST_DIR}/VariadicMacrosTests.cpp
${SELF_TEST_DIR}/VariadicMacrosTests.cpp
) )
# configure the executable # configure the executable
include_directories(${CATCH_DIR}/include) include_directories(${CATCH_DIR}/include)
add_executable(SelfTest ${SOURCES}) add_executable(SelfTest ${SOURCES})
# configure unit tests via ctest # configure unit tests via CTest
enable_testing() enable_testing()
add_test(NAME SelfTest_run COMMAND SelfTest) add_test(NAME RunTests COMMAND SelfTest)
#add_test(NAME SelfTest_run COMMAND python ${SCRIPTS_DIR}/approvalTests.py "${CMAKE_CURRENT_BINARY_DIR}/SelfTest")
add_test(NAME ListTests COMMAND SelfTest --list-tests)
set_tests_properties(ListTests PROPERTIES PASS_REGULAR_EXPRESSION "[0-9]+ test cases")
add_test(NAME ListTags COMMAND SelfTest --list-tags)
set_tests_properties(ListTags PROPERTIES PASS_REGULAR_EXPRESSION "[0-9]+ tags")