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

Move @cwalther's tests into new dir scheme.

Darryl Pogue 11 years ago committed by Anne Marije v/d Meer
parent
078d59dfa0
commit
d6cb56fd9c
10 changed files with 39 additions and 123 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. 2
      Sources/Plasma/PubUtilLib/plUnifiedTime/CMakeLists.txt
  2. 1
      Sources/Plasma/PubUtilLib/plUnifiedTime/plUnifiedTime.cpp
  3. 4
      Sources/Tests/CMakeLists.txt
  4. 1
      Sources/Tests/FeatureTests/CMakeLists.txt
  5. 19
      Sources/Tests/FeatureTests/pfPythonTest/CMakeLists.txt
  6. 3
      Sources/Tests/FeatureTests/pfPythonTest/test_cyMisc.cpp
  7. 2
      Sources/Tests/PubUtilTests/CMakeLists.txt
  8. 10
      Sources/Tests/PubUtilTests/plUnifiedTimeTest/CMakeLists.txt
  9. 2
      Sources/Tests/PubUtilTests/plUnifiedTimeTest/test_plUnifiedTime.cpp
  10. 118
      Tests/CMakeLists.txt

2
Sources/Plasma/PubUtilLib/plUnifiedTime/CMakeLists.txt
Unescape View File

@ -17,5 +17,7 @@ set(plUnifiedTime_HEADERS
add_library(plUnifiedTime STATIC ${plUnifiedTime_SOURCES} ${plUnifiedTime_HEADERS})
target_link_libraries(plUnifiedTime CoreLib)
source_group("Source Files" FILES ${plUnifiedTime_SOURCES})
source_group("Header Files" FILES ${plUnifiedTime_HEADERS})

1
Sources/Plasma/PubUtilLib/plUnifiedTime/plUnifiedTime.cpp
Unescape View File

@ -45,6 +45,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "plUnifiedTime.h"
#include "hsWindows.h"
#include "hsStream.h"
#include "plString.h"
#if HS_BUILD_FOR_UNIX
#include <sys/time.h>

4
Sources/Tests/CMakeLists.txt
Unescape View File

@ -5,6 +5,6 @@ endif()
add_subdirectory(gtest-1.6.0)
add_subdirectory(CoreLibTests)
#add_subdirectory(FeatureTests)
add_subdirectory(FeatureTests)
add_subdirectory(NucleusTests)
#add_subdirectory(PubUtilTests)
add_subdirectory(PubUtilTests)

1
Sources/Tests/FeatureTests/CMakeLists.txt
Unescape View File

@ -0,0 +1 @@
add_subdirectory(pfPythonTest)

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

@ -0,0 +1,19 @@
include_directories(${GTEST_INCLUDE_DIR})
include_directories(${gtest_SOURCE_DIR}/include ${gtest_SOURCE_DIR})
include_directories(../../../Plasma/CoreLib)
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)
if(PYTHON_DEBUG_LIBRARY)
target_link_libraries(test_cyMisc debug ${PYTHON_DEBUG_LIBRARY})
target_link_libraries(test_cyMisc optimized ${PYTHON_LIBRARY})
else()
target_link_libraries(test_cyMisc ${PYTHON_LIBRARY})
endif()
add_test(NAME test_cyMisc COMMAND test_cyMisc)

3
Tests/testCyMisc.cpp → Sources/Tests/FeatureTests/pfPythonTest/test_cyMisc.cpp
Unescape View File

@ -41,8 +41,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*==LICENSE==*/
#include <iomanip>
#include "gtest/gtest.h"
#include <gtest/gtest.h>
#include "pfPython/cyMisc.h"

2
Sources/Tests/PubUtilTests/CMakeLists.txt
Unescape View File

@ -0,0 +1,2 @@
add_subdirectory(plUnifiedTimeTest)

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

@ -0,0 +1,10 @@
include_directories(${GTEST_INCLUDE_DIR})
include_directories(${gtest_SOURCE_DIR}/include ${gtest_SOURCE_DIR})
include_directories(../../../Plasma/CoreLib)
include_directories(../../../Plasma/NucleusLib)
include_directories(../../../Plasma/PubUtilLib)
add_executable(test_plUnifiedTime test_plUnifiedTime.cpp)
target_link_libraries(test_plUnifiedTime gtest gtest_main)
target_link_libraries(test_plUnifiedTime plUnifiedTime)
add_test(NAME test_plUnifiedTime COMMAND test_plUnifiedTime)

2
Tests/testPlUnifiedTime.cpp → Sources/Tests/PubUtilTests/plUnifiedTimeTest/test_plUnifiedTime.cpp
Unescape View File

@ -40,7 +40,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*==LICENSE==*/
#include "gtest/gtest.h"
#include <gtest/gtest.h>
#include "plUnifiedTime/plUnifiedTime.h"

118
Tests/CMakeLists.txt
Unescape View File

@ -1,118 +0,0 @@
cmake_minimum_required(VERSION 2.8)
set(gtest_force_shared_crt ON CACHE INTERNAL "don't link the CRT statically into gtest as we later link the test executable dynamically")
add_subdirectory(gtest-1.6.0)
include_directories(${gtest_SOURCE_DIR}/include)
include_directories(../Sources/Plasma/CoreLib)
include_directories(../Sources/Plasma/FeatureLib)
include_directories(../Sources/Plasma/FeatureLib/inc)
include_directories(../Sources/Plasma/NucleusLib)
include_directories(../Sources/Plasma/NucleusLib/inc)
include_directories(../Sources/Plasma/PubUtilLib)
include_directories(../Sources/Plasma/PubUtilLib/inc)
include_directories(${PYTHON_INCLUDE_DIR})
set(test_SOURCES
testCyMisc.cpp
testPlUnifiedTime.cpp
)
set(test_plClient_SOURCES
../Sources/Plasma/Apps/plClient/pfAllCreatables.cpp
../Sources/Plasma/Apps/plClient/plAllCreatables.cpp
../Sources/Plasma/Apps/plClient/pnAllCreatables.cpp
)
add_executable(runUnitTests ${test_SOURCES} ${test_plClient_SOURCES})
target_link_libraries(runUnitTests gtest gtest_main)
target_link_libraries(runUnitTests CoreLib)
target_link_libraries(runUnitTests pfAnimation)
target_link_libraries(runUnitTests pfAudio)
target_link_libraries(runUnitTests pfCamera)
target_link_libraries(runUnitTests pfCharacter)
target_link_libraries(runUnitTests pfConditional)
target_link_libraries(runUnitTests pfConsole)
target_link_libraries(runUnitTests pfConsoleCore)
target_link_libraries(runUnitTests pfGameGUIMgr)
target_link_libraries(runUnitTests pfGameMgr)
target_link_libraries(runUnitTests pfGameScoreMgr)
target_link_libraries(runUnitTests pfJournalBook)
target_link_libraries(runUnitTests pfLocalizationMgr)
target_link_libraries(runUnitTests pfMessage)
target_link_libraries(runUnitTests pfPython)
target_link_libraries(runUnitTests pfSurface)
target_link_libraries(runUnitTests plAgeDescription)
target_link_libraries(runUnitTests plAgeLoader)
target_link_libraries(runUnitTests plAudible)
target_link_libraries(runUnitTests plAudio)
target_link_libraries(runUnitTests plAudioCore)
target_link_libraries(runUnitTests plAvatar)
target_link_libraries(runUnitTests plClientResMgr)
target_link_libraries(runUnitTests plClipboard)
target_link_libraries(runUnitTests plCompression)
target_link_libraries(runUnitTests plContainer)
target_link_libraries(runUnitTests plDrawable)
target_link_libraries(runUnitTests plGImage)
target_link_libraries(runUnitTests plGLight)
target_link_libraries(runUnitTests plInputCore)
target_link_libraries(runUnitTests plInterp)
target_link_libraries(runUnitTests plIntersect)
target_link_libraries(runUnitTests plMath)
target_link_libraries(runUnitTests plMessage)
target_link_libraries(runUnitTests plModifier)
target_link_libraries(runUnitTests plNetClient)
target_link_libraries(runUnitTests plNetClientComm)
target_link_libraries(runUnitTests plNetClientRecorder)
target_link_libraries(runUnitTests plNetCommon)
target_link_libraries(runUnitTests plNetGameLib)
target_link_libraries(runUnitTests plNetMessage)
target_link_libraries(runUnitTests plNetTransport)
target_link_libraries(runUnitTests plParticleSystem)
target_link_libraries(runUnitTests plPhysical)
target_link_libraries(runUnitTests plPhysX)
target_link_libraries(runUnitTests plPipeline)
target_link_libraries(runUnitTests plProgressMgr)
target_link_libraries(runUnitTests plResMgr)
target_link_libraries(runUnitTests plScene)
target_link_libraries(runUnitTests plSDL)
target_link_libraries(runUnitTests plSurface)
target_link_libraries(runUnitTests plTransform)
target_link_libraries(runUnitTests plUnifiedTime)
target_link_libraries(runUnitTests plVault)
target_link_libraries(runUnitTests pnAsyncCore)
target_link_libraries(runUnitTests pnAsyncCoreExe)
target_link_libraries(runUnitTests pnEncryption)
target_link_libraries(runUnitTests pnInputCore)
target_link_libraries(runUnitTests pnModifier)
target_link_libraries(runUnitTests pnNetBase)
target_link_libraries(runUnitTests pnNetCli)
target_link_libraries(runUnitTests pnNetProtocol)
target_link_libraries(runUnitTests pnSceneObject)
if(PYTHON_DEBUG_LIBRARY)
target_link_libraries(runUnitTests debug ${PYTHON_DEBUG_LIBRARY})
target_link_libraries(runUnitTests optimized ${PYTHON_LIBRARY})
else()
target_link_libraries(runUnitTests ${PYTHON_LIBRARY})
endif()
target_link_libraries(runUnitTests ${OPENAL_LIBRARY})
target_link_libraries(runUnitTests ${EXPAT_LIBRARY})
target_link_libraries(runUnitTests ${JPEG_LIBRARY})
target_link_libraries(runUnitTests ${PNG_LIBRARY})
target_link_libraries(runUnitTests ${Speex_LIBRARY})
target_link_libraries(runUnitTests ${PHYSX_LIBRARIES})
target_link_libraries(runUnitTests ${DirectX_LIBRARIES})
if (WIN32)
target_link_libraries(runUnitTests Vfw32)
target_link_libraries(runUnitTests winmm)
endif(WIN32)
source_group("Test Sources" FILES ${test_SOURCES})
source_group("plClient Sources" FILES ${test_plClient_SOURCES})
enable_testing()
add_test(
NAME runUnitTests
COMMAND runUnitTests
)
Write Preview
Loading…
Cancel
Save