Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 23:36:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Can start Interface

Browse source
This commit is contained in:
NissimHadar 2018-10-30 13:02:13 -07:00
parent 1213f3f658
commit 418a578e28
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -188,15 +188,21 @@ void TestRunner::runInstaller() {
exit(-1); exit(-1);
} }
QString installFolder = QString("\"") + _workingFolder + "/High Fidelity\"";
if (!QDir().exists(installFolder)) {
QDir().mkdir(installFolder);
}
// This script installs High Fidelity. It is run as "yes | install_app.sh... so "yes" is killed at the end
script.write("#/bin/sh\n\n"); script.write("#/bin/sh\n\n");
script.write("VOLUME=`hdiutil attach \"$1\" | grep Volumes | awk '{print $3}'`\n"); script.write("VOLUME=`hdiutil attach \"$1\" | grep Volumes | awk '{print $3}'`\n");
script.write((QString("mkdir \"") + _workingFolder + "/High Fidelity\"\n").toStdString().c_str());
QStringList urlParts = _buildInformation.url.split('/'); QStringList urlParts = _buildInformation.url.split('/');
QString installerFileName = urlParts[urlParts.length() - 1].split('.')[0]; QString installerFileName = urlParts[urlParts.length() - 1].split('.')[0];
script.write((QString("cp -rf \"$VOLUME/") + "/High Fidelity/interface.app\" \"" + _workingFolder + "/High Fidelity/\"\n").toStdString().c_str()); script.write((QString("cp -rf \"$VOLUME/") + "/High Fidelity/interface.app\" \"" + _workingFolder + "/High Fidelity/\"\n").toStdString().c_str());
script.write("hdiutil detach \"$VOLUME\"\n"); script.write("hdiutil detach \"$VOLUME\"\n");
script.write("killall yes\n");
script.close(); script.close();
script.setPermissions(QFile::ReadOwner | QFile::WriteOwner | QFile::ExeOwner); script.setPermissions(QFile::ReadOwner | QFile::WriteOwner | QFile::ExeOwner);
@ -350,8 +356,6 @@ void TestRunner::startLocalServerProcesses() {
} }
void TestRunner::runInterfaceWithTestScript() { void TestRunner::runInterfaceWithTestScript() {
QString exeFile = QString("\"") + QDir::toNativeSeparators(_installationFolder) + "\\interface.exe\"";
QString url = QString("hifi://localhost"); QString url = QString("hifi://localhost");
if (_runServerless->isChecked()) { if (_runServerless->isChecked()) {
// Move to an empty area // Move to an empty area
@ -363,9 +367,14 @@ void TestRunner::runInterfaceWithTestScript() {
QString testScript = QString testScript =
QString("https://raw.githubusercontent.com/") + _user + "/hifi_tests/" + _branch + "/tests/testRecursive.js"; QString("https://raw.githubusercontent.com/") + _user + "/hifi_tests/" + _branch + "/tests/testRecursive.js";
#ifdef Q_OS_WIN
QString exeFile = QString("\"") + QDir::toNativeSeparators(_installationFolder) + "\\interface.exe\"";
QString commandLine = exeFile + " --url " + url + " --no-updater" + " --testScript " + testScript + QString commandLine = exeFile + " --url " + url + " --no-updater" + " --testScript " + testScript +
" quitWhenFinished --testResultsLocation " + _snapshotFolder; " quitWhenFinished --testResultsLocation " + _snapshotFolder;
#elif defined Q_OS_MAC
QString commandLine = "open -a \"" +_installationFolder + "/interface.app\"";
#endif
// Helpful for debugging // Helpful for debugging
appendLog(commandLine); appendLog(commandLine);