Bug 841935: Use sys.executable to invoke b2g update scripts. r=jgriffin
authorMarshall Culpepper <marshall@mozilla.com>
Fri, 22 Feb 2013 23:02:26 -0600
changeset 122720 c863d79841e9ac6e8b70c02053192e483929e251
parent 122719 6b597b71926503de2713b34313eebe67a9fd796c
child 122721 c2c1e378ab494f983a2a76846f936991ed3cfdce
push id23460
push usermculpepper@mozilla.com
push dateSat, 23 Feb 2013 05:07:31 +0000
treeherdermozilla-inbound@c863d79841e9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjgriffin
bugs841935
milestone22.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 841935: Use sys.executable to invoke b2g update scripts. r=jgriffin
testing/marionette/update-smoketests/smoketest.py
testing/marionette/update-smoketests/stage-update.py
--- a/testing/marionette/update-smoketests/smoketest.py
+++ b/testing/marionette/update-smoketests/smoketest.py
@@ -130,17 +130,17 @@ class SmokeTestRunner(object):
 
         start_data = self.config.get_build_data(device, start_id)
         finish_data = self.config.get_build_data(device, finish_id)
 
         partial_mar = os.path.join(run_dir, 'partial.mar')
         if not os.path.exists(partial_mar):
             build_gecko_mar = os.path.join(self.b2g.update_tools,
                                            'build-gecko-mar.py')
-            subprocess.check_call([build_gecko_mar,
+            subprocess.check_call([sys.executable, build_gecko_mar,
                                    '--from', start_data.complete_mar,
                                    '--to', finish_data.complete_mar,
                                    partial_mar])
         finish_data['partial_mar'] = partial_mar
 
         testvars = os.path.join(run_dir, 'testvars.json')
         if not os.path.exists(testvars):
             open(testvars, 'w').write(json.dumps({
--- a/testing/marionette/update-smoketests/stage-update.py
+++ b/testing/marionette/update-smoketests/stage-update.py
@@ -45,17 +45,17 @@ def stage_update(device, stage_dir):
 
     build_flash_fota = os.path.join(b2g.update_tools, 'build-flash-fota.py')
 
     flash_zip = os.path.join(build_dir, 'flash.zip')
 
     print 'Building flash zip for device %s, version %s, build %s...' % \
           (device, app_version, build_id)
 
-    subprocess.check_call([build_flash_fota,
+    subprocess.check_call([sys.executable, build_flash_fota,
         '--system-dir', os.path.join(target_out_dir, 'system'),
         '--system-fs-type', device_data.system_fs_type,
         '--system-location', device_data.system_location,
         '--data-fs-type', device_data.data_fs_type,
         '--data-location', device_data.data_location,
         '--output', flash_zip])
 
     complete_mar = os.path.join(build_dir, 'complete.mar')