Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-12 07:18:21 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Reverted render-utils and ui tests to be manual tests (not unit tests, and not incorporating QtTest).

Browse source
This commit is contained in:
Seiji Emery 2015-06-23 17:13:43 -07:00
parent 57b86c0762
commit 1f0d9a250a
6 changed files with 39 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
tests/render-utils/CMakeLists.txt
View file

@ -1,12 +1,13 @@
# Declare dependencies
macro (setup_testcase_dependencies)
#include_oglplus()
set(TARGET_NAME render-utils-test)
# This is not a testcase -- just set it up as a regular hifi project
setup_hifi_project(Quick Gui OpenGL)
set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "Tests/manual-tests/")
# link in the shared libraries
link_hifi_libraries(render-utils gpu shared)
#include_oglplus()
copy_dlls_beside_windows_executable()
endmacro ()
# link in the shared libraries
link_hifi_libraries(render-utils gpu shared)
setup_hifi_testcase(Quick Gui OpenGL)
copy_dlls_beside_windows_executable()

19
tests/render-utils/src/RenderUtilsTests.h
View file

@ -1,19 +0,0 @@
//
// RenderUtilsTests.h
// hifi
//
// Created by Seiji Emery on 6/23/15.
//
//
#ifndef hifi_RenderUtilsTests_h
#define hifi_RenderUtilsTests_h
class RenderUtilsTests : public QObject {
Q_OBJECT
private slots:
};
#endif

2
tests/shared/src/MovingMinMaxAvgTests.cpp
View file

@ -15,6 +15,8 @@
#include <NumericalConstants.h>
QTEST_MAIN(MovingMinMaxAvgTests)
quint64 MovingMinMaxAvgTests::randQuint64() {
quint64 ret = 0;
for (int i = 0; i < 32; i++) {

2
tests/shared/src/MovingPercentileTests.cpp
View file

@ -16,6 +16,8 @@
#include <qqueue.h>
QTEST_MAIN(MovingPercentileTests)
float MovingPercentileTests::random() {
return rand() / (float)RAND_MAX;
}

13
tests/shared/src/MovingPercentileTests.h
View file

@ -12,11 +12,16 @@
#ifndef hifi_MovingPercentileTests_h
#define hifi_MovingPercentileTests_h
namespace MovingPercentileTests {
#include <QtTest/QtTest>
class MovingPercentileTests : public QObject {
Q_OBJECT
private slots:
void runAllTests();
private:
float random();
void runAllTests();
}
};
#endif // hifi_MovingPercentileTests_h

32
tests/ui/CMakeLists.txt
View file

@ -1,17 +1,19 @@
# Declare testcase dependencies
macro (setup_testcase_dependencies)
if (WIN32)
add_dependency_external_projects(glew)
find_package(GLEW REQUIRED)
target_include_directories(${TARGET_NAME} PRIVATE ${GLEW_INCLUDE_DIRS})
target_link_libraries(${TARGET_NAME} ${GLEW_LIBRARIES} wsock32.lib opengl32.lib Winmm.lib)
endif()
# link in the shared libraries
link_hifi_libraries(ui render-utils gpu shared)
copy_dlls_beside_windows_executable()
endmacro()
set(TARGET_NAME "ui-test")
setup_hifi_testcase(Widgets OpenGL Network Qml Quick Script)
# This is not a testcase -- just set it up as a regular hifi project
setup_hifi_project(Widgets OpenGL Network Qml Quick Script)
set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "Tests/manual-tests/")
if (WIN32)
add_dependency_external_projects(glew)
find_package(GLEW REQUIRED)
target_include_directories(${TARGET_NAME} PRIVATE ${GLEW_INCLUDE_DIRS})
target_link_libraries(${TARGET_NAME} ${GLEW_LIBRARIES} wsock32.lib opengl32.lib Winmm.lib)
endif()
# link in the shared libraries
link_hifi_libraries(ui render-utils gpu shared)
copy_dlls_beside_windows_executable()