Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-20 09:20:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

WIP.

Browse source
This commit is contained in:
Nissim Hadar 2017-11-13 10:25:31 -08:00
parent 572646b8c6
commit aa4320104b
7 changed files with 26 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
tools/auto-tester/CMakeLists.txt
View file

@ -4,31 +4,28 @@ project(${TARGET_NAME})
setup_hifi_project(Widgets) setup_hifi_project(Widgets)
link_hifi_libraries() link_hifi_libraries()
set ( SOURCES set(CMAKE_AUTOMOC ON)
src/main.cpp set(CMAKE_AUTOUIC ON)
src/Test.cpp
src/ui/AutoTester.cpp set_property(TARGET auto-tester PROPERTY WIN32_EXECUTABLE true)
src/ui/MismatchWindow.cpp
set(SOURCES src/main.cpp src/Test.cpp src/ui/AutoTester.cpp src/ui/MismatchWindow.cpp)
set(MOC_HEADERS src/ui/AutoTester.h src/ui/MismatchWindow.h)
set(UIS ui/AutoTester.ui ui/MismatchWindow.ui)
set(RESOURCES src/AutoTester.qrc)
QT5_ADD_RESOURCES(RES_SOURCES ${RESOURCES})
QT5_WRAP_UI(UI_HEADERS ${UIS})
QT5_WRAP_CPP(MOC_SRCS ${MOC_HEADERS})
add_executable(PROJECT_NAME ${SOURCES} ${MOC_SRCS} ${RES_SOURCES} ${UI_HEADERS})
target_link_libraries(PROJECT_NAME ${QT_LIBRARIES})
add_custom_command(
TARGET auto-tester
POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:Qt5::Core> $<TARGET_FILE_DIR:auto-tester>
COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:Qt5::Gui> $<TARGET_FILE_DIR:auto-tester>
COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:Qt5::Widgets> $<TARGET_FILE_DIR:auto-tester>
) )
set ( MOC_HEADERS
src/ui/AutoTester.h
src/ui/MismatchWindow.h
)
set ( UIS
ui/AutoTester.ui
ui/MismatchWindow.ui
)
set ( RESOURCES
src/AutoTester.qrc
)
QT5_ADD_RESOURCES( RES_SOURCES ${RESOURCES} )
QT5_WRAP_UI( UI_HEADERS ${UIS} )
QT5_WRAP_CPP( MOC_SRCS ${MOC_HEADERS} )
add_executable( PROJECT_NAME ${SOURCES} ${MOC_SRCS} ${RES_SOURCES} ${UI_HEADERS} )
target_link_libraries( PROJECT_NAME ${QT_LIBRARIES} )

2
tools/auto-tester/src/AutoTester.qrc
View file

@ -1,4 +1,4 @@
<RCC> <RCC>
<qresource prefix="autoTester"> <qresource prefix="AutoTester">
</qresource> </qresource>
</RCC> </RCC>

2
tools/auto-tester/src/Test.cpp
View file

@ -72,7 +72,7 @@ void Test::evaluateTests() {
bool success{ true }; bool success{ true };
bool keepOn{ true }; bool keepOn{ true };
for (int i = 0; keepOn && i < expectedImages.length(); ++i) { for (int i = 0; keepOn && i < expectedImages.length(); ++i) {
QString diffFilename = "hifi_autoTest_diff.txt"; QString diffFilename = "HIFI_AutoTest_diff.txt";
QString command = "magick.exe compare -metric MAE " + expectedImages[i] + " " + resultImages[i] + " null: 2>" + diffFilename; QString command = "magick.exe compare -metric MAE " + expectedImages[i] + " " + resultImages[i] + " null: 2>" + diffFilename;
system(command.toStdString().c_str()); system(command.toStdString().c_str());

2
tools/auto-tester/src/main.cpp
View file

@ -8,7 +8,7 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
// //
#include <QtWidgets/QApplication> #include <QtWidgets/QApplication>
#include "ui/autoTester.h" #include "ui/AutoTester.h"
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {

2
tools/auto-tester/src/ui/AutoTester.cpp
View file

@ -1,5 +1,5 @@
// //
// autoTester.cpp // AutoTester.cpp
// zone/ambientLightInheritence // zone/ambientLightInheritence
// //
// Created by Nissim Hadar on 2 Nov 2017. // Created by Nissim Hadar on 2 Nov 2017.

2
tools/auto-tester/src/ui/AutoTester.h
View file

@ -12,7 +12,7 @@
#define hifi_AutoTester_h #define hifi_AutoTester_h
#include <QtWidgets/QMainWindow> #include <QtWidgets/QMainWindow>
#include "ui_autoTester.h" #include "ui_AutoTester.h"
#include "../Test.h" #include "../Test.h"
class AutoTester : public QMainWindow class AutoTester : public QMainWindow

4
tools/auto-tester/ui/autoTester.ui → tools/auto-tester/ui/AutoTester.ui
View file

@ -11,7 +11,7 @@
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>autoTester</string> <string>AutoTester</string>
</property> </property>
<widget class="QWidget" name="centralWidget"> <widget class="QWidget" name="centralWidget">
<widget class="QPushButton" name="closeButton"> <widget class="QPushButton" name="closeButton">
@ -76,7 +76,7 @@
</widget> </widget>
<layoutdefault spacing="6" margin="11"/> <layoutdefault spacing="6" margin="11"/>
<resources> <resources>
<include location="autoTester.qrc"/> <include location="../src/AutoTester.qrc"/>
</resources> </resources>
<connections/> <connections/>
</ui> </ui>