Merge lp:~aacid/ubuntu-performance-tests/work_with_qt_56 into lp:ubuntu-performance-tests

[Albert Astals Cid]

Work with Qt 5.6 qmlprofiler

[Sergio Cazzolato (sergio-j-cazzolato)]

I modified the implementation and pushed to the trunk, it is working well with the old qmlprofiler version. Could you please validate the trunk against the new qmlprofiler?

=== modified file 'kpi/dashqmlmetrics/runner.py'
--- kpi/dashqmlmetrics/runner.py	2016-07-06 04:26:30 +0000
+++ kpi/dashqmlmetrics/runner.py	2016-08-23 15:59:09 +0000
@@ -124,10 +124,25 @@
         logger.info('Waiting for dash to start')
         time.sleep(1)
 
+    # Determine if qmlprofiler is >= 5.6
+    qmlprofiler = subprocess.Popen(
+        "qmlprofiler -fromStart", shell=True,
+        universal_newlines=True, stdin=subprocess.PIPE,
+        stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    stdout, stderr = qmlprofiler.communicate()
+
+    is_new_qmlprofiler = "Unknown option" in stderr
+
     # Start the qmlprofiler, connects to localhost but is really the adb device
-    qmlprofiler = subprocess.Popen(
-        "qmlprofiler -v -fromStart -attach 127.0.0.1 -p 11111", shell=True,
-        universal_newlines=True, stdin=subprocess.PIPE)
+    if is_new_qmlprofiler:
+        qmlprofiler = subprocess.Popen(
+            "qmlprofiler --interactive -attach 127.0.0.1 -p 11111", shell=True,
+            universal_newlines=True, stdin=subprocess.PIPE,
+            stderr=subprocess.PIPE)
+    else:
+        qmlprofiler = subprocess.Popen(
+            "qmlprofiler -v -fromStart -attach 127.0.0.1 -p 11111", shell=True,
+            universal_newlines=True, stdin=subprocess.PIPE)
 
     # Wait for autopilot to finish
     logger.info("Waiting for autopilot test to finish")
@@ -135,7 +150,16 @@
     logger.info("Autopilot test finished")
 
     logger.info("Finishing QML profiler")
-    qmlprofiler.communicate("r\nq\n")
+    if is_new_qmlprofiler:
+        qmlprofiler.stdin.writelines("f trace_"+str(int(time.time()))+".qtd\n")
+        qmlprofiler.stdin.flush()
+        output = qmlprofiler.stderr.readline()
+        while not "Data written to" in output:
+            output = qmlprofiler.stderr.readline()
+        qmlprofiler.stdin.writelines("q\n")
+        qmlprofiler.communicate()
+    else:
+        qmlprofiler.communicate("r\nq\n")
     qmlprofiler.wait()
     logger.info("QML profiles finished")