Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-13 08:56:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Install into High Fidelity folder.

Browse source
This commit is contained in:
NissimHadar 2018-09-06 22:31:49 -07:00
parent e9a1da832e
commit 543c1c9265
2 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
tools/auto-tester/src/TestRunner.cpp
View file

@ -62,11 +62,13 @@ void TestRunner::installerDownloadComplete() {
void TestRunner::runInstaller() {
// Qt cannot start an installation process using QProcess::start (Qt Bug 9761)
// To allow installation, the installer is run using the `system` command
QStringList arguments{ QStringList() << QString("/S") << QString("/D=") + QDir::toNativeSeparators(_tempFolder) };
QStringList arguments{ QStringList() << QString("/S") << QString("/D=") + QDir::toNativeSeparators(_installationFolder) };
QString installerFullPath = _tempFolder + "/" + INSTALLER_FILENAME;
QString commandLine = QDir::toNativeSeparators(installerFullPath) + " /S /D=" + QDir::toNativeSeparators(_tempFolder);
QString commandLine =
QDir::toNativeSeparators(installerFullPath) + " /S /D=" + QDir::toNativeSeparators(_installationFolder);
system(commandLine.toStdString().c_str());
}
@ -112,6 +114,8 @@ void TestRunner::selectTemporaryFolder() {
_tempFolder = previousSelection;
return;
}
_installationFolder = _tempFolder + "/High Fidelity";
}
void TestRunner::createSnapshotFolder() {
@ -150,10 +154,11 @@ void TestRunner::startLocalServerProcesses() {
#ifdef Q_OS_WIN
QString commandLine;
commandLine = "start \"domain-server.exe\" " + QDir::toNativeSeparators(_tempFolder) + "\\domain-server.exe";
commandLine = "start \"domain-server.exe\" \"" + QDir::toNativeSeparators(_installationFolder) + "\\domain-server.exe\"";
system(commandLine.toStdString().c_str());
commandLine = "start \"assignment-client.exe\" " + QDir::toNativeSeparators(_tempFolder) + "\\assignment-client.exe -n 6";
commandLine =
"start \"assignment-client.exe\" \"" + QDir::toNativeSeparators(_installationFolder) + "\\assignment-client.exe\" -n 6";
system(commandLine.toStdString().c_str());
#endif
// Give server processes time to stabilize
@ -162,8 +167,8 @@ void TestRunner::startLocalServerProcesses() {
void TestRunner::runInterfaceWithTestScript() {
#ifdef Q_OS_WIN
QString commandLine = QDir::toNativeSeparators(_tempFolder) +
"\\interface.exe --url hifi://localhost --testScript https://raw.githubusercontent.com/" + _user +
QString commandLine = QString("\"") + QDir::toNativeSeparators(_installationFolder) +
"\\interface.exe\" --url hifi://localhost --testScript https://raw.githubusercontent.com/" + _user +
"/hifi_tests/" + _branch + "/tests/testRecursive.js quitWhenFinished --testResultsLocation " +
_snapshotFolder;

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

@ -46,6 +46,8 @@ private:
QString _tempFolder;
QString _snapshotFolder;
QString _installationFolder;
Downloader* _downloader;
const QString UNIQUE_FOLDER_NAME{ "fgadhcUDHSFaidsfh3478JJJFSDFIUSOEIrf" };