Working changes before merge.

tools/nitpick/src/Nitpick.cpp

@@ -38,7 +38,7 @@ Nitpick::Nitpick(QWidget* parent) : QMainWindow(parent) {
  
     _ui.plainTextEdit->setReadOnly(true);
 
-    setWindowTitle("Nitpick - v3.1.3");
+    setWindowTitle("Nitpick - " + nitpickVersion);
 
     clientProfiles << "VR-High" << "Desktop-High" << "Desktop-Low" << "Mobile-Touch" << "VR-Standalone";
     _ui.clientProfileComboBox->insertItems(0, clientProfiles);

tools/nitpick/src/TestRunnerMobile.cpp

@@ -211,8 +211,6 @@ void TestRunnerMobile::runInterface() {
         _adbInterface = new AdbInterface();
     }
 
-    sendServerIPToDevice();
-
     _statusLabel->setText("Starting Interface");
 
     QString testScript = (_runFullSuite->isChecked())
@@ -230,7 +228,7 @@ void TestRunnerMobile::runInterface() {
     QString command = _adbInterface->getAdbCommand() +
         " shell am start -n " + startCommand +
         " --es args \\\"" +
-        " --url file:///~/serverless/tutorial.json" +
+        " --url hifi://" + getServerIP() + "/0,0,0"
         " --no-updater" +
         " --no-login-suggestion" +
         " --testScript " + testScript + " quitWhenFinished" +
@@ -257,8 +255,8 @@ void TestRunnerMobile::pullFolder() {
 #endif
 }
 
-void TestRunnerMobile::sendServerIPToDevice() {
-    // Get device IP
+QString TestRunnerMobile::getServerIP() {
+    // Get device IP (ifconfig.txt was created when connecting)
     QFile ifconfigFile{ _workingFolder + "/ifconfig.txt" };
     if (!ifconfigFile.open(QIODevice::ReadOnly | QIODevice::Text)) {
         QMessageBox::critical(0, "Internal error: " + QString(__FILE__) + ":" + QString::number(__LINE__),
@@ -309,7 +307,7 @@ void TestRunnerMobile::sendServerIPToDevice() {
                     if (!serverIP.isNull()) {
                         QMessageBox::critical(0, "Internal error: " + QString(__FILE__) + ":" + QString::number(__LINE__),
                             "Cannot identify server IP (multiple interfaces on device submask)");
-                        return;
+                        return QString("CANNOT IDENTIFY SERVER IP");
                     } else {
                         union {
                             uint32_t ip;
@@ -325,6 +323,8 @@ void TestRunnerMobile::sendServerIPToDevice() {
     }
 
     ifconfigFile.close();
+
+    return serverIP;
 }
 
 qint64 TestRunnerMobile::convertToBinary(const QString& str) {

tools/nitpick/src/TestRunnerMobile.h

@@ -52,7 +52,7 @@ public:
 
     void pullFolder();
 
-    void sendServerIPToDevice();
+    QString getServerIP();
     qint64 convertToBinary (const QString& str);
 
 private:

tools/nitpick/src/common.h

@@ -60,4 +60,5 @@ const double R_Y = 0.212655f;
 const double G_Y = 0.715158f;
 const double B_Y = 0.072187f;
 
+const QString nitpickVersion{ "21660" }; 
 #endif // hifi_common_h