Merge lp:~elopio/ubuntu-ui-toolkit/launch_qmlscene into lp:ubuntu-ui-toolkit

[Leo Arias]

Rolled back to launch qmlscene just calling the binary on the path.

DO NOT MERGE YET!

[lp:~elopio/ubuntu-ui-toolkit/launch_qmlscene]

808. By Leo Arias on 2013-10-24

Removed the no-longer needed dependency.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:808
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1087/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/82
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/81/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/35
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/35
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/35/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/73
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/82
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/82/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/81
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/81/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/2708/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/2759/console
    SUCCESS: http://10.97.0.26:8080/job/touch-flash-device/457
    SUCCESS: http://10.97.0.26:8080/job/touch-flash-device/454

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/ubuntu-ui-toolkit-ci/1087/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

808. By Leo Arias on 2013-10-24

Removed the no-longer needed dependency.

807. By Leo Arias on 2013-10-24

Try launching qmlscene directly to see if the arch is no longer needed.

=== modified file 'debian/control'
--- debian/control	2013-10-04 19:49:11 +0000
+++ debian/control	2013-10-24 19:52:22 +0000
@@ -113,7 +113,6 @@
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          libautopilot-qt,
-         dpkg-dev,
          libqt5test5,
          libqt5widgets5,
          python-autopilot (>= 1.3),

=== modified file 'tests/autopilot/ubuntuuitoolkit/base.py'
--- tests/autopilot/ubuntuuitoolkit/base.py	2013-10-04 06:26:43 +0000
+++ tests/autopilot/ubuntuuitoolkit/base.py	2013-10-24 19:52:22 +0000
@@ -16,8 +16,6 @@
 
 """Base classes for Autopilot tests using the Ubuntu UI Toolkit."""
 
-import subprocess
-
 from autopilot import (
     input,
     platform,
@@ -27,12 +25,7 @@
 
 def get_qmlscene_launch_command():
     """Return the command to launch qmlscene for autopilot tests."""
-    # We need to specify qt5 because qtchooser doesn't have a default
-    # configuration on devices and it seems the environment variable
-    # QT_SELECT=qt5 doesn't work for autopilot tests. --Mirv - 2013-10-03
-    arch = subprocess.check_output(
-        ["dpkg-architecture", "-qDEB_HOST_MULTIARCH"]).strip()
-    return '/usr/lib/' + arch + '/qt5/bin/qmlscene'
+    return 'qmlscene'
 
 
 class UbuntuUIToolkitAppTestCase(testcase.AutopilotTestCase):