OU
/
CWE-ou-minkata
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git
2
1
Fork 0
Code Releases Activity
Browse Source

make check working, 1 test app per library

Darryl Pogue 11 years ago committed by Anne Marije v/d Meer
parent
d6cb56fd9c
commit
e2887eb075
8 changed files with 47 additions and 37 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      CMakeLists.txt
  2. 4
      Sources/Tests/CMakeLists.txt
  3. 16
      Sources/Tests/CoreLibTests/CMakeLists.txt
  4. 15
      Sources/Tests/CoreTests/CMakeLists.txt
  5. 0
      Sources/Tests/CoreTests/test_plString.cpp
  6. 19
      Sources/Tests/FeatureTests/pfPythonTest/CMakeLists.txt
  7. 21
      Sources/Tests/NucleusTests/pnEncryptionTest/CMakeLists.txt
  8. 8
      Sources/Tests/PubUtilTests/plUnifiedTimeTest/CMakeLists.txt

1
CMakeLists.txt
Unescape View File

@ -135,5 +135,6 @@ add_subdirectory(Sources/Tools)
if(PLASMA_BUILD_TESTS)
enable_testing()
add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND})
add_subdirectory(Sources/Tests EXCLUDE_FROM_ALL)
endif(PLASMA_BUILD_TESTS)

4
Sources/Tests/CMakeLists.txt
Unescape View File

@ -4,7 +4,7 @@ endif()
add_subdirectory(gtest-1.6.0)
add_subdirectory(CoreLibTests)
add_subdirectory(FeatureTests)
add_subdirectory(CoreTests)
add_subdirectory(NucleusTests)
add_subdirectory(PubUtilTests)
add_subdirectory(FeatureTests)

16
Sources/Tests/CoreLibTests/CMakeLists.txt
Unescape View File

@ -1,16 +0,0 @@
project(CoreLibTests)
include_directories(${GTEST_INCLUDE_DIR})
include_directories(${gtest_SOURCE_DIR}/include ${gtest_SOURCE_DIR})
include_directories(../../Plasma/CoreLib)
SET(TEST_PLSTRING
PlStringTest.cpp)
add_executable(plStringTest ${TEST_PLSTRING})
target_link_libraries(plStringTest gtest gtest_main CoreLib)
add_test(
NAME plStringTest
COMMAND plStringTest
)

15
Sources/Tests/CoreTests/CMakeLists.txt
Unescape View File

@ -0,0 +1,15 @@
include_directories(${GTEST_INCLUDE_DIR})
include_directories(${gtest_SOURCE_DIR}/include ${gtest_SOURCE_DIR})
include_directories(../../Plasma/CoreLib)
SET(CoreLibTest_SOURCES
test_plString.cpp
)
add_executable(test_CoreLib ${CoreLibTest_SOURCES})
target_link_libraries(test_CoreLib gtest gtest_main)
target_link_libraries(test_CoreLib CoreLib)
add_test(NAME test_CoreLib COMMAND test_CoreLib)
add_dependencies(check test_CoreLib)

0
Sources/Tests/CoreLibTests/PlStringTest.cpp → Sources/Tests/CoreTests/test_plString.cpp
Unescape View File

19
Sources/Tests/FeatureTests/pfPythonTest/CMakeLists.txt
Unescape View File

@ -5,15 +5,20 @@ include_directories(../../../Plasma/NucleusLib)
include_directories(../../../Plasma/PubUtilLib)
include_directories(../../../Plasma/FeatureLib)
add_executable(test_cyMisc test_cyMisc.cpp)
target_link_libraries(test_cyMisc gtest gtest_main)
target_link_libraries(test_cyMisc pfPython)
set(pfPythonTest_SOURCES
test_cyMisc.cpp
)
add_executable(test_pfPython ${pfPythonTest_SOURCES})
target_link_libraries(test_pfPython gtest gtest_main)
target_link_libraries(test_pfPython pfPython)
if(PYTHON_DEBUG_LIBRARY)
target_link_libraries(test_cyMisc debug ${PYTHON_DEBUG_LIBRARY})
target_link_libraries(test_cyMisc optimized ${PYTHON_LIBRARY})
target_link_libraries(test_pfPython debug ${PYTHON_DEBUG_LIBRARY})
target_link_libraries(test_pfPython optimized ${PYTHON_LIBRARY})
else()
target_link_libraries(test_cyMisc ${PYTHON_LIBRARY})
target_link_libraries(test_pfPython ${PYTHON_LIBRARY})
endif()
add_test(NAME test_cyMisc COMMAND test_cyMisc)
add_test(NAME test_pfPython COMMAND test_pfPython)
add_dependencies(check test_pfPython)

21
Sources/Tests/NucleusTests/pnEncryptionTest/CMakeLists.txt
Unescape View File

@ -2,16 +2,15 @@ include_directories(${GTEST_INCLUDE_DIR})
include_directories(${gtest_SOURCE_DIR}/include ${gtest_SOURCE_DIR})
include_directories(../../../Plasma/CoreLib)
include_directories(../../../Plasma/NucleusLib)
include_directories(${OPENSSL_INCLUDE_DIR})
add_executable(test_plMD5Checksum test_plMD5Checksum.cpp)
target_link_libraries(test_plMD5Checksum gtest gtest_main)
target_link_libraries(test_plMD5Checksum ${OPENSSL_LIBRARIES})
target_link_libraries(test_plMD5Checksum CoreLib pnEncryption)
add_test(NAME test_plMD5Checksum COMMAND test_plMD5Checksum)
set(pnEncryptionTest_SOURCES
test_plMD5Checksum.cpp
test_plSHA1Checksum.cpp
)
add_executable(test_plSHA1Checksum test_plSHA1Checksum.cpp)
target_link_libraries(test_plSHA1Checksum gtest gtest_main)
target_link_libraries(test_plSHA1Checksum ${OPENSSL_LIBRARIES})
target_link_libraries(test_plSHA1Checksum CoreLib pnEncryption)
add_test(NAME test_plSHA1Checksum COMMAND test_plSHA1Checksum)
add_executable(test_pnEncryption ${pnEncryptionTest_SOURCES})
target_link_libraries(test_pnEncryption gtest gtest_main)
target_link_libraries(test_pnEncryption pnEncryption)
add_test(NAME test_pnEncryption COMMAND test_pnEncryption)
add_dependencies(check test_pnEncryption)

8
Sources/Tests/PubUtilTests/plUnifiedTimeTest/CMakeLists.txt
Unescape View File

@ -4,7 +4,13 @@ include_directories(../../../Plasma/CoreLib)
include_directories(../../../Plasma/NucleusLib)
include_directories(../../../Plasma/PubUtilLib)
add_executable(test_plUnifiedTime test_plUnifiedTime.cpp)
set(plUnifiedTimeTest_SOURCES
test_plUnifiedTime.cpp
)
add_executable(test_plUnifiedTime ${plUnifiedTimeTest_SOURCES})
target_link_libraries(test_plUnifiedTime gtest gtest_main)
target_link_libraries(test_plUnifiedTime plUnifiedTime)
add_test(NAME test_plUnifiedTime COMMAND test_plUnifiedTime)
add_dependencies(check test_plUnifiedTime)

Write Preview
Loading…
Cancel
Save