added test pass/fail counting to octree unit tests

This commit is contained in:
ZappoMan 2014-06-09 10:41:43 -07:00
parent 8834da60b9
commit 493ad6ae9e
4 changed files with 704 additions and 181 deletions

View file

@ -12,9 +12,9 @@ set(MACRO_DIR ${ROOT_DIR}/cmake/macros)
# setup for find modules
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/modules/")
#find_package(Qt5Network REQUIRED)
#find_package(Qt5Script REQUIRED)
#find_package(Qt5Widgets REQUIRED)
find_package(Qt5Network REQUIRED)
find_package(Qt5Script REQUIRED)
find_package(Qt5Widgets REQUIRED)
include(${MACRO_DIR}/SetupHifiProject.cmake)
setup_hifi_project(${TARGET_NAME} TRUE)
@ -22,7 +22,7 @@ setup_hifi_project(${TARGET_NAME} TRUE)
include(${MACRO_DIR}/AutoMTC.cmake)
auto_mtc(${TARGET_NAME} ${ROOT_DIR})
#qt5_use_modules(${TARGET_NAME} Network Script Widgets)
qt5_use_modules(${TARGET_NAME} Network Script Widgets)
#include glm
include(${MACRO_DIR}/IncludeGLM.cmake)
@ -30,11 +30,14 @@ include_glm(${TARGET_NAME} ${ROOT_DIR})
# link in the shared libraries
include(${MACRO_DIR}/LinkHifiLibrary.cmake)
link_hifi_library(shared ${TARGET_NAME} ${ROOT_DIR})
link_hifi_library(octree ${TARGET_NAME} ${ROOT_DIR})
link_hifi_library(voxels ${TARGET_NAME} ${ROOT_DIR})
link_hifi_library(animation ${TARGET_NAME} ${ROOT_DIR})
link_hifi_library(fbx ${TARGET_NAME} ${ROOT_DIR})
link_hifi_library(networking ${TARGET_NAME} ${ROOT_DIR})
link_hifi_library(models ${TARGET_NAME} ${ROOT_DIR})
link_hifi_library(octree ${TARGET_NAME} ${ROOT_DIR})
link_hifi_library(particles ${TARGET_NAME} ${ROOT_DIR})
link_hifi_library(shared ${TARGET_NAME} ${ROOT_DIR})
link_hifi_library(voxels ${TARGET_NAME} ${ROOT_DIR})
IF (WIN32)
#target_link_libraries(${TARGET_NAME} Winmm Ws2_32)

File diff suppressed because it is too large Load diff

View file

@ -14,10 +14,10 @@
namespace OctreeTests {
void propertyFlagsTests();
void byteCountCodingTests();
void propertyFlagsTests(bool verbose);
void byteCountCodingTests(bool verbose);
void runAllTests();
void runAllTests(bool verbose);
}
#endif // hifi_OctreeTests_h

View file

@ -9,8 +9,16 @@
//
#include "OctreeTests.h"
#include "SharedUtil.h"
int main(int argc, char** argv) {
OctreeTests::runAllTests();
int main(int argc, const char* argv[]) {
const char* VERBOSE = "--verbose";
bool verbose = cmdOptionExists(argc, argv, VERBOSE);
qDebug() << "OctreeTests::runAllTests() ************************************";
qDebug("Verbose=%s", debug::valueOf(verbose));
qDebug() << "***************************************************************";
OctreeTests::runAllTests(verbose);
return 0;
}