merged from default

changeset: 1502:013b18518ac7 parent: 1500:0adb324a74e3 user: ffxbld date: Mon May 06 18:31:17 2013 -0400 summary: Added FENNEC_21_0b7_RELEASE FENNEC_21_0b7_BUILD1 tag(s) for changeset production. DONTBUILD CLOSED TREE a=release changeset: 1503:e684fcc2aed3 user: ffxbld date: Mon May 06 18:48:15 2013 -0400 summary: Added FIREFOX_21_0b7_RELEASE FIREFOX_21_0b7_BUILD1 tag(s) for changeset production. DONTBUILD CLOSED TREE a=release changeset: 1504:94d964e58af1 user: ffxbld date: Tue May 07 04:34:24 2013 -0400 summary: Added FENNEC_21_0_RELEASE FENNEC_21_0_BUILD1 tag(s) for changeset production. DONTBUILD CLOSED TREE a=release changeset: 1505:138c1065e5c4 user: ffxbld date: Tue May 07 04:50:45 2013 -0400 summary: Added FIREFOX_21_0_RELEASE FIREFOX_21_0_BUILD1 tag(s) for changeset production. DONTBUILD CLOSED TREE a=release changeset: 1506:78d4aca4330d user: Aki Sasaki <asasaki@mozilla.com> date: Tue May 07 12:18:07 2013 -0700 summary: No bug - show downloaded file size. r=catlee changeset: 1507:09d9913ed060 user: ffxbld date: Wed May 08 01:03:01 2013 -0400 summary: Added FIREFOX_21_0_RELEASE FIREFOX_21_0_BUILD2 tag(s) for changeset production. DONTBUILD CLOSED TREE a=release changeset: 1508:1287327b0f15 user: Chris AtLee <catlee@mozilla.com> date: Wed May 08 12:47:59 2013 -0400 summary: Bug 807792: Fix emulator/generic target special casing. r=jhopkins changeset: 1509:f08c264808e7 user: Rail Aliiev <rail@mozilla.com> date: Wed May 08 13:46:18 2013 -0400 summary: Bug 859867 - Need to check out one of the new linux hardware slaves to troubleshoot B2G emulator problems. r=aki changeset: 1510:7bc7a9084139 user: Chris AtLee <catlee@mozilla.com> date: Wed May 08 15:44:59 2013 -0400 summary: Bug 861426: Fix update channels for unagi. r=nthomas changeset: 1511:1d6aad19bb18 user: ffxbld date: Wed May 08 19:01:06 2013 -0400 summary: Added FENNEC_21_0b8_RELEASE FENNEC_21_0b8_BUILD1 tag(s) for changeset production. DONTBUILD CLOSED TREE a=release changeset: 1512:635c8b3ba5f6 tag: tip user: ffxbld date: Thu May 09 01:40:54 2013 -0400 summary: Added FENNEC_21_0_RELEASE FENNEC_21_0_BUILD2 tag(s) for changeset production. DONTBUILD CLOSED TREE a=release --HG-- branch : production
mozilla · May 9, 2013 · d3062db · d3062db
2 parents b81644e + bca38cd
commit d3062db
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 4 deletions.
diff --git a/.hgtags b/.hgtags
@@ -1034,3 +1034,19 @@ ba087e77749f012c420132525a66b17a835f6e9a FENNEC_21_0b6_RELEASE
 ba087e77749f012c420132525a66b17a835f6e9a FENNEC_21_0b6_BUILD1
 ba087e77749f012c420132525a66b17a835f6e9a FIREFOX_21_0b6_RELEASE
 ba087e77749f012c420132525a66b17a835f6e9a FIREFOX_21_0b6_BUILD1
+d705ac6ea92f57fc35f24173568bd7e2c9be8d66 FENNEC_21_0b7_RELEASE
+d705ac6ea92f57fc35f24173568bd7e2c9be8d66 FENNEC_21_0b7_BUILD1
+d705ac6ea92f57fc35f24173568bd7e2c9be8d66 FIREFOX_21_0b7_RELEASE
+d705ac6ea92f57fc35f24173568bd7e2c9be8d66 FIREFOX_21_0b7_BUILD1
+d705ac6ea92f57fc35f24173568bd7e2c9be8d66 FENNEC_21_0_RELEASE
+d705ac6ea92f57fc35f24173568bd7e2c9be8d66 FENNEC_21_0_BUILD1
+d705ac6ea92f57fc35f24173568bd7e2c9be8d66 FIREFOX_21_0_RELEASE
+d705ac6ea92f57fc35f24173568bd7e2c9be8d66 FIREFOX_21_0_BUILD1
+d705ac6ea92f57fc35f24173568bd7e2c9be8d66 FIREFOX_21_0_RELEASE
+d705ac6ea92f57fc35f24173568bd7e2c9be8d66 FIREFOX_21_0_RELEASE
+d705ac6ea92f57fc35f24173568bd7e2c9be8d66 FIREFOX_21_0_BUILD2
+d705ac6ea92f57fc35f24173568bd7e2c9be8d66 FENNEC_21_0b8_RELEASE
+d705ac6ea92f57fc35f24173568bd7e2c9be8d66 FENNEC_21_0b8_BUILD1
+d705ac6ea92f57fc35f24173568bd7e2c9be8d66 FENNEC_21_0_RELEASE
+d705ac6ea92f57fc35f24173568bd7e2c9be8d66 FENNEC_21_0_RELEASE
+d705ac6ea92f57fc35f24173568bd7e2c9be8d66 FENNEC_21_0_BUILD2
diff --git a/configs/b2g/emulator_automation_config.py b/configs/b2g/emulator_automation_config.py
@@ -13,6 +13,10 @@
         'tooltool.py': "/tools/tooltool.py",
     },
 
+    "env": {
+        "__GL_YIELD": "NOTHING",
+    },
+
     "find_links": ["http://repos/python/packages"],
     "pip_index": False,
 

diff --git a/configs/b2g/releng-beta.py b/configs/b2g/releng-beta.py
@@ -78,5 +78,6 @@
         'http://android.git.linaro.org/git-ro/': 'https://git.mozilla.org/external/linaro',
         'git://github.com/apitrace/': 'https://git.mozilla.org/external/apitrace',
     },
-    "update_channel": "beta",
+    "nightly_update_channel": "beta",
+    "publish_channel": "nightly",
 }
diff --git a/mozharness/base/script.py b/mozharness/base/script.py
@@ -223,6 +223,8 @@ def download_file(self, url, file_name=None, parent_dir=None,
             error_message="Can't download from %s to %s!" % (url, file_name),
             error_level=error_level,
         )
+        if status == file_name:
+            self.info("Downloaded %d bytes." % os.path.getsize(file_name))
         return status
 
     def move(self, src, dest, log_level=INFO, error_level=ERROR,

diff --git a/scripts/b2g_build.py b/scripts/b2g_build.py
@@ -587,7 +587,6 @@ def write_b2g_config(self):
         # and specifies which target to use
         device_name = self.config['target']
         device = {
-            'emulator': 'generic',
             'pandaboard': 'panda',
         }.get(device_name, device_name)
 
@@ -599,7 +598,7 @@ def write_b2g_config(self):
             "DEVICE=%s" % device,
         ]
         # TODO: eh? what's this for? config.sh does it, but why?
-        if device_name == 'emulator':
+        if device_name == 'generic':
             lines.append("LUNCH=full-eng")
 
         # Make sure we get a blank line at the end

diff --git a/scripts/b2g_emulator_unittest.py b/scripts/b2g_emulator_unittest.py
@@ -348,7 +348,7 @@ def run_tests(self):
         if suite_name == 'xpcshell':
             success_codes = [0, 1]
 
-        env = {}
+        env = self.config.get('env', {})
         if self.query_minidump_stackwalk():
             env['MINIDUMP_STACKWALK'] = self.minidump_stackwalk_path
         env = self.query_env(partial_env=env)