Merge autoland to mozilla-central. a=merge
authorCosmin Sabou <csabou@mozilla.com>
Mon, 18 Jun 2018 18:50:36 +0300
changeset 808181 97eb512f532b933d8b5b72f160815e0727229890
parent 808177 b73265d537e68d57c35846e581624b98e6ec6331 (current diff)
parent 808180 4cdab1b804e8038f9844ae71a3769cf88c50ad55 (diff)
child 808182 9b74b9f2939a7ae3a0ea6e711dc32ed5203e03ff
push id113304
push userbmo:nchen@mozilla.com
push dateMon, 18 Jun 2018 16:45:39 +0000
reviewersmerge
milestone62.0a1
Merge autoland to mozilla-central. a=merge
--- a/js/xpconnect/src/nsXPConnect.cpp
+++ b/js/xpconnect/src/nsXPConnect.cpp
@@ -68,17 +68,19 @@ const char XPC_XPCONNECT_CONTRACTID[]   
 // nsXPConnect and when creating a new cooperative (non-primary) XPCJSContext.
 static XPCJSContext* gPrimaryContext;
 
 nsXPConnect::nsXPConnect()
     : mShuttingDown(false)
 {
     XPCJSContext::InitTLS();
 
+#ifdef MOZ_GECKO_PROFILER
     JS::SetProfilingThreadCallbacks(profiler_register_thread, profiler_unregister_thread);
+#endif
 
     XPCJSContext* xpccx = XPCJSContext::NewXPCJSContext(nullptr);
     if (!xpccx) {
         MOZ_CRASH("Couldn't create XPCJSContext.");
     }
     gPrimaryContext = xpccx;
     mRuntime = xpccx->Runtime();
 }
--- a/testing/geckodriver/build.rs
+++ b/testing/geckodriver/build.rs
@@ -27,25 +27,25 @@ fn main() {
     writeln!(
         fh,
         "const COMMIT_DATE: Option<&'static str> = {:?};",
         commit_date()
     ).unwrap();
 }
 
 fn commit_hash() -> Option<String> {
-    exec(&"hg", &["log", "-r.", "-T '{node|short}'"]).or_else(
+    exec(&"hg", &["log", "-r.", "-T{node|short}"]).or_else(
         || {
             exec(&"git", &["rev-parse", "HEAD"]).and_then(hg2git_sha)
         },
     )
 }
 
 fn commit_date() -> Option<String> {
-    exec(&"hg", &["log", "-r.", "-T '{date|isodate}'"]).or_else(|| {
+    exec(&"hg", &["log", "-r.", "-T{date|isodate}"]).or_else(|| {
         exec(
             &"git",
             &["log", "-1", "--date=short", "--pretty=format:%cd"],
         )
     })
 }
 
 fn exec<S, I>(program: S, args: I) -> Option<String>