Installs both interface and Sandbox. Runs interface.

This commit is contained in:
NissimHadar 2018-10-30 16:30:56 -07:00
parent 418a578e28
commit 41b70ffab5

View file

@ -84,7 +84,12 @@ void TestRunner::setWorkingFolder() {
return; return;
} }
#ifdef Q_OS_WIN
_installationFolder = _workingFolder + "/High Fidelity"; _installationFolder = _workingFolder + "/High Fidelity";
#elif defined Q_OS_MAC
_installationFolder = _workingFolder + "/High_Fidelity";
#endif
_logFile.setFileName(_workingFolder + "/log.txt"); _logFile.setFileName(_workingFolder + "/log.txt");
autoTester->enableRunTabControls(); autoTester->enableRunTabControls();
@ -188,7 +193,7 @@ void TestRunner::runInstaller() {
exit(-1); exit(-1);
} }
QString installFolder = QString("\"") + _workingFolder + "/High Fidelity\""; QString installFolder = QString("\"") + _workingFolder + "/High_Fidelity\"";
if (!QDir().exists(installFolder)) { if (!QDir().exists(installFolder)) {
QDir().mkdir(installFolder); QDir().mkdir(installFolder);
} }
@ -197,10 +202,9 @@ void TestRunner::runInstaller() {
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");
QStringList urlParts = _buildInformation.url.split('/'); script.write((QString("cp -rf \"$VOLUME/") + "/High Fidelity/interface.app\" \"" + _workingFolder + "/High_Fidelity/\"\n").toStdString().c_str());
QString installerFileName = urlParts[urlParts.length() - 1].split('.')[0]; script.write((QString("cp -rf \"$VOLUME/") + "/High Fidelity/Sandbox.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.write("killall yes\n");
script.close(); script.close();