From fe9c6052f73a55aa1873485fa6ae6a7c1d6bf580 Mon Sep 17 00:00:00 2001
From: NissimHadar <nissim@highfidelity.io>
Date: Thu, 3 May 2018 15:02:11 -0700
Subject: [PATCH] Added `quitWhenFinished` parameter to the command line.

---
 interface/src/Application.cpp | 15 +++++++++++----
 interface/src/Application.h   |  1 +
 interface/src/ui/Snapshot.cpp |  2 ++
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index d8c162a79c..fed6caab89 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -743,7 +743,9 @@ extern DisplayPluginList getDisplayPlugins();
 extern InputPluginList getInputPlugins();
 extern void saveInputPluginSettings(const InputPluginList& plugins);
 
+// Parameters used for running tests from teh command line
 const QString TEST_SCRIPT { "--testScript" };
+const QString TEST_QUIT_WHEN_FINISHED { "--quitWhenFinished" };
 const QString TEST_SNAPSHOT_LOCATION { "--testSnapshotLocation" };
 
 bool setupEssentials(int& argc, char** argv, bool runningMarkerExisted) {
@@ -1018,11 +1020,16 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
         const QStringList args = arguments();
 
         for (int i = 0; i < args.size() - 1; ++i) {
-            if (args.at(i) == TEST_SCRIPT) {
+            if (args.at(i) == TEST_SCRIPT  && (i + 1) < args.size()) {
                 QString testScriptPath = args.at(i + 1);
                 if (QFileInfo(testScriptPath).exists()) {
                     setProperty(hifi::properties::TEST, QUrl::fromLocalFile(testScriptPath));
-                } 
+                }
+
+				// quite when finished parameter must directly follow the test script
+                if ((i + 2) < args.size() && args.at(i + 2) == TEST_QUIT_WHEN_FINISHED) {
+                    quitWhenFinished = true;
+                }
             } else if (args.at(i) == TEST_SNAPSHOT_LOCATION) {
                 // Set test snapshot location only if it is a writeable directory
                 QString pathname(args.at(i + 1));
@@ -2161,8 +2168,8 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
         auto scriptEngines = DependencyManager::get<ScriptEngines>();
         const auto testScript = property(hifi::properties::TEST).toUrl();
        
-        // Set last parameter to exit interface when the test script finishes
-        scriptEngines->loadScript(testScript, false, false, false, false, true);
+        // Set last parameter to exit interface when the test script finishes, if so requested
+        scriptEngines->loadScript(testScript, false, false, false, false, quitWhenFinished);
 
         // This is done so we don't get a "connection time-out" message when we haven't passed in a URL.
         if (arguments().contains("--url")) {
diff --git a/interface/src/Application.h b/interface/src/Application.h
index 088b74aa9b..cc366c74fe 100644
--- a/interface/src/Application.h
+++ b/interface/src/Application.h
@@ -740,5 +740,6 @@ private:
     std::atomic<bool> _pendingRenderEvent { true };
 
     QString testSnapshotLocation;
+    bool quitWhenFinished { false };
 };
 #endif // hifi_Application_h
diff --git a/interface/src/ui/Snapshot.cpp b/interface/src/ui/Snapshot.cpp
index d52f01223c..5616b35ac0 100644
--- a/interface/src/ui/Snapshot.cpp
+++ b/interface/src/ui/Snapshot.cpp
@@ -73,6 +73,7 @@ SnapshotMetaData* Snapshot::parseSnapshotData(QString snapshotPath) {
     return data;
 }
 
+#pragma optimize("", off)
 QString Snapshot::saveSnapshot(QImage image, const QString& filename, const QString& pathname) {
 
     QFile* snapshotFile = savedFileForSnapshot(image, false, filename, pathname);
@@ -92,6 +93,7 @@ QTemporaryFile* Snapshot::saveTempSnapshot(QImage image) {
     return static_cast<QTemporaryFile*>(savedFileForSnapshot(image, true, QString(), QString()));
 }
 
+#pragma optimize("", off)
 QFile* Snapshot::savedFileForSnapshot(QImage & shot, bool isTemporary, const QString& userSelectedFilename, const QString& userSelectedPathname) {
 
     // adding URL to snapshot