Mirrors/overte-AleziaKurdis
3
0
Fork 0
mirror of https://github.com/AleziaKurdis/overte.git synced 2025-04-08 06:32:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'autoTester' of https://github.com/NissimHadar/hifi into autoTester

Browse source
This commit is contained in:
nissim.hadar 2017-11-14 16:20:05 -08:00
commit df614f3a9e
5 changed files with 28 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -5,20 +5,27 @@ project(${TARGET_NAME})
SET(CMAKE_AUTOUIC ON)
SET(CMAKE_AUTOMOC ON)
setup_hifi_project(Widgets)
setup_hifi_project(Core Widgets)
link_hifi_libraries()
set_property(TARGET auto-tester PROPERTY WIN32_EXECUTABLE true)
# Qt includes
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
include_directories(${Qt5Core_INCLUDE_DIRS})
include_directories(${Qt5Widgets_INCLUDE_DIRS})
# This is preferred to GLOB_RECURSE, as per CMake documentation
set(SOURCES src/main.cpp src/Test.cpp src/ui/autoTester.cpp src/ui/mismatchWindow.cpp)
set(MOC_HEADERS src/autoTester.h src/mismatchWindow.h)
set(UIS src/ui/autoTester.ui src/ui/mismatchWindow.ui)
set(QT_LIBRARIES Qt5::Core Qt5::Widgets)
# Find all sources files
file (GLOB_RECURSE SOURCES src/*.cpp)
file (GLOB_RECURSE MOC_HEADERS src/*.h)
file (GLOB_RECURSE UIS src/ui/*.ui)
if (WIN32)
add_executable(PROJECT_NAME WIN32 ${SOURCES} ${MOC_SRCS} ${UI_HEADERS})
# Do not show Console
set_property(TARGET auto-tester PROPERTY WIN32_EXECUTABLE true)
add_executable(PROJECT_NAME WIN32 ${SOURCES} ${MOC_SRCS} ${UI_HEADERS})
else()
add_executable(PROJECT_NAME ${SOURCES} ${MOC_SRCS} ${RES_SOURCES} ${UI_HEADERS})
add_executable(PROJECT_NAME ${SOURCES} ${MOC_SRCS} ${RES_SOURCES} ${UI_HEADERS})
endif()
target_link_libraries(PROJECT_NAME ${QT_LIBRARIES})

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

@ -30,7 +30,7 @@
#include "Test.h"
#include <assert.h>
#include <QTextStream>
#include <QtCore/QTextStream>
Test::Test() {
snapshotFilenameFormat = QRegularExpression("hifi-snap-by-.+-on-\\d\\d\\d\\d-\\d\\d-\\d\\d_\\d\\d-\\d\\d-\\d\\d.jpg");
@ -74,11 +74,16 @@ void Test::evaluateTests() {
for (int i = 0; keepOn && i < expectedImages.length(); ++i) {
QString diffFilename = "HIFI_AutoTest_diff.txt";
QString command = "magick.exe compare -metric MAE " + expectedImages[i] + " " + resultImages[i] + " null: 2>" + diffFilename;
system(command.toStdString().c_str());
if (system(command.toStdString().c_str()) == -1) {
// command has failed
messageBox.critical(0, "Aborting!", "Error executing magick.exe");
exit(-1);
}
QFile file(diffFilename);
if (!file.open(QIODevice::ReadOnly)) {
messageBox.critical(0, "error", file.errorString());
messageBox.critical(0, "Error", file.errorString());
}
// First value on line is the comparison result

6
tools/auto-tester/src/Test.h
View file

@ -12,9 +12,9 @@
#ifndef hifi_test_h
#define hifi_test_h
#include <QFileDialog>
#include <QMessagebox>
#include <QRegularExpression>
#include <QtWidgets/QFileDialog>
#include <QtWidgets/QMessageBox>
#include <QtCore/QRegularExpression>
#include "ui/MismatchWindow.h"

2
tools/auto-tester/src/common.h
View file

@ -10,7 +10,7 @@
#ifndef hifi_common_h
#define hifi_common_h
#include <QString>
#include <QtCore/QString>
class TestFailure {
public:

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

@ -9,7 +9,7 @@
//
#include "MismatchWindow.h"
#include <QFileInfo>
#include <QtCore/QFileInfo>
MismatchWindow::MismatchWindow(QWidget *parent)
: QDialog(parent)