Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 22:28:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch '19991-MacAppData' of https://github.com/NissimHadar/hifi into 19991-MacAppData

Browse source
This commit is contained in:
NissimHadar 2018-11-27 17:17:50 -08:00
commit 57ba50fa96
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tools/nitpick/src/TestRunner.cpp
View file

@ -336,7 +336,7 @@ void TestRunner::saveExistingHighFidelityAppDataFolder() {
#ifdef Q_OS_WIN
dataDirectory = qgetenv("USERPROFILE") + "\\AppData\\Roaming";
#elif defined Q_OS_MAC
dataDirectory{ QDir::homePath() + "/Library/Application Support" };
dataDirectory = QDir::homePath() + "/Library/Application Support";
#endif
if (_runLatest->isChecked()) {
_appDataFolder = dataDirectory + "/High Fidelity";
@ -527,8 +527,6 @@ void TestRunner::runInterfaceWithTestScript() {
}
void TestRunner::interfaceExecutionComplete() {
killProcesses();
QFileInfo testCompleted(QDir::toNativeSeparators(_snapshotFolder) +"/tests_completed.txt");
if (!testCompleted.exists()) {
QMessageBox::critical(0, "Tests not completed", "Interface seems to have crashed before completion of the test scripts\nExisting images will be evaluated");
@ -536,6 +534,8 @@ void TestRunner::interfaceExecutionComplete() {
evaluateResults();
killProcesses();
// The High Fidelity AppData folder will be restored after evaluation has completed
}