merge default -> production

--HG-- branch : production
mozilla · Apr 9, 2013 · 6efbea9 · 6efbea9
2 parents d341f45 + 5564bee
commit 6efbea9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/.hgtags b/.hgtags
@@ -1003,3 +1003,9 @@ c71960e9fb87eddb5c33985b0adc2044b6c36f35 FIREFOX_20_0b6_BUILD1
 7fc56b7ff5dc2d64271795af871a6bfbcbe03592 THUNDERBIRD_17_0_5esr_BUILD1
 7fc56b7ff5dc2d64271795af871a6bfbcbe03592 FIREFOX_17_0_5esr_RELEASE
 7fc56b7ff5dc2d64271795af871a6bfbcbe03592 FIREFOX_17_0_5esr_BUILD1
+0a8bfba4d8e1053cc284bba7ec4d07c10d926a86 FENNEC_21_0b1_RELEASE
+0a8bfba4d8e1053cc284bba7ec4d07c10d926a86 FENNEC_21_0b1_BUILD1
+0a8bfba4d8e1053cc284bba7ec4d07c10d926a86 FIREFOX_21_0b1_RELEASE
+0a8bfba4d8e1053cc284bba7ec4d07c10d926a86 FIREFOX_21_0b1_BUILD1
+0a8bfba4d8e1053cc284bba7ec4d07c10d926a86 FIREFOX_21_0b2_RELEASE
+0a8bfba4d8e1053cc284bba7ec4d07c10d926a86 FIREFOX_21_0b2_BUILD1
diff --git a/configs/b2g/releng-otoro.py b/configs/b2g/releng-otoro.py
@@ -24,7 +24,7 @@
     "upload_remote_host": "pvtbuilds.pvt.build.mozilla.org",
     "upload_remote_basepath": "/pvt/mozilla.org/b2gotoro/tinderbox-builds",
     "upload_remote_nightly_basepath": "/pvt/mozilla.org/b2gotoro/nightly",
-    "upload_dep_target_exclusions": ["unagi", "otoro", "inari", "leo"],
+    "upload_dep_target_exclusions": ["unagi", "otoro", "inari", "leo", "hamachi"],
     "tooltool_servers": ["http://runtime-binaries.pvt.build.mozilla.org/tooltool/"],
     "gittool_share_base": "/builds/git-shared/git",
     "gittool_base_mirror_urls": [],

diff --git a/mozharness/mozilla/testing/errors.py b/mozharness/mozilla/testing/errors.py
@@ -44,7 +44,7 @@
         'known_fail_group': None,
     },
     "harness_error": {
-        'full_regex': re.compile(r"(TEST-UNEXPECTED-FAIL|PROCESS-CRASH) \| .* \| (application crashed|missing output line for total leaks!|negative leaks caught!|\d+ bytes leaked)"),
+        'full_regex': re.compile(r"(?:TEST-UNEXPECTED-FAIL|PROCESS-CRASH) \| .* \| (application crashed|missing output line for total leaks!|negative leaks caught!|\d+ bytes leaked)"),
         'minimum_regex': re.compile(r'''(TEST-UNEXPECTED|PROCESS-CRASH)''')
     },
 }