Bug 1032777 - Include base image version for Flame device. r=wlachance
authorDave Hunt <dhunt@mozilla.com>
Wed, 03 Sep 2014 06:20:00 -0400
changeset 203412 2643d34b1dde22729918a3b52d5c8088f18e83f9
parent 203411 db85cbf798e28e4bf96dddbb248cea4583749422
child 203413 9906ac54c8fcb541e1132ba5df0d501fd18fe36d
push id27425
push userryanvm@gmail.com
push dateWed, 03 Sep 2014 20:38:59 +0000
treeherdermozilla-central@acbdce59da2f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerswlachance
bugs1032777
milestone35.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1032777 - Include base image version for Flame device. r=wlachance
testing/mozbase/mozversion/mozversion/mozversion.py
--- a/testing/mozbase/mozversion/mozversion/mozversion.py
+++ b/testing/mozbase/mozversion/mozversion/mozversion.py
@@ -219,16 +219,20 @@ class RemoteB2GVersion(B2GVersion):
             'ro.build.date.utc': 'device_firmware_date',
             'ro.product.device': 'device_id'}
         for line in build_props.split('\n'):
             if not line.strip().startswith('#') and '=' in line:
                 key, value = [s.strip() for s in line.split('=', 1)]
                 if key in desired_props.keys():
                     self._info[desired_props[key]] = value
 
+        if self._info['device_id'].lower() == 'flame':
+            self._info['device_firmware_version_base'] = dm._runCmd(
+                ['shell', 'getprop', 't2m.sw.version']).output[0]
+
 
 def get_version(binary=None, sources=None, dm_type=None, host=None,
                 device_serial=None):
     """
     Returns the application version information as a dict. You can specify
     a path to the binary of the application or an Android APK file (to get
     version information for Firefox for Android). If this is omitted then the
     current directory is checked for the existance of an application.ini