mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-09 11:25:00 +00:00
only force the profile manager on you if you aren't cltbld and if you don't
have this other magic flag set. r=mcafee
This commit is contained in:
parent
d3654c6194
commit
fa6ca7be57
@ -566,15 +566,15 @@ nsProfile::ProcessArgs(nsICmdLineService *cmdLineArgs,
|
||||
}
|
||||
}
|
||||
|
||||
#ifndef DEBUG_cltbld
|
||||
/* hack so we don't do this for tinderbox. I need to figure out the real fix */
|
||||
/* hack so we don't do this for tinderbox. otherwise the tree goes orange */
|
||||
#if !defined(DEBUG_cltbld) && !defined(MOZ_BYPASS_PROFILE_AT_STARTUP)
|
||||
#ifdef DEBUG
|
||||
if (profileURLStr.Length() == 0) {
|
||||
printf("DEBUG BUILDS ONLY: we are forcing you to use the profile manager to help smoke test it.\n");
|
||||
profileURLStr = PROFILE_MANAGER_URL;
|
||||
}
|
||||
#endif /* DEBUG */
|
||||
#endif /* DEBUG_cltbld */
|
||||
#endif /* !DEBUG_cltbld && !MOZ_BYPASS_PROFILE_AT_STARTUP */
|
||||
|
||||
#ifdef DEBUG_profile
|
||||
printf("Profile Manager : Command Line Options : End\n");
|
||||
|
Loading…
Reference in New Issue
Block a user