mozilla-bmo1634646.patch
author Wolfgang Rosenauer <wr@rosenauer.org>
Thu, 11 Jun 2020 21:56:33 +0200
branchfirefox77
changeset 1128 0d95fa645411
permissions -rw-r--r--
Firefox 77.0.1
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1128
0d95fa645411 Firefox 77.0.1
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     1
# HG changeset patch
0d95fa645411 Firefox 77.0.1
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     2
# User Wolfgang Rosenauer <wr@rosenauer.org>
0d95fa645411 Firefox 77.0.1
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     3
# Parent  43820d9e289abee98a2e3cdb4314848de3bc8622
0d95fa645411 Firefox 77.0.1
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     4
0d95fa645411 Firefox 77.0.1
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     5
diff --git a/build/pgo/profileserver.py b/build/pgo/profileserver.py
0d95fa645411 Firefox 77.0.1
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     6
--- a/build/pgo/profileserver.py
0d95fa645411 Firefox 77.0.1
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     7
+++ b/build/pgo/profileserver.py
0d95fa645411 Firefox 77.0.1
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     8
@@ -127,17 +127,17 @@ if __name__ == '__main__':
0d95fa645411 Firefox 77.0.1
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     9
         # Bug 1553850 considers fixing this.
0d95fa645411 Firefox 77.0.1
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    10
         env["MOZ_DISABLE_CONTENT_SANDBOX"] = "1"
0d95fa645411 Firefox 77.0.1
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    11
         env["MOZ_DISABLE_RDD_SANDBOX"] = "1"
0d95fa645411 Firefox 77.0.1
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    12
 
0d95fa645411 Firefox 77.0.1
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    13
         # Ensure different pids write to different files
0d95fa645411 Firefox 77.0.1
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    14
         env["LLVM_PROFILE_FILE"] = "default_%p_random_%m.profraw"
0d95fa645411 Firefox 77.0.1
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    15
 
0d95fa645411 Firefox 77.0.1
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    16
         # Write to an output file if we're running in automation
0d95fa645411 Firefox 77.0.1
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    17
-        process_args = {}
0d95fa645411 Firefox 77.0.1
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    18
+        process_args = {'universal_newlines': True}
0d95fa645411 Firefox 77.0.1
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    19
         if 'UPLOAD_PATH' in env:
0d95fa645411 Firefox 77.0.1
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    20
             process_args['logfile'] = os.path.join(env['UPLOAD_PATH'], 'profile-run-1.log')
0d95fa645411 Firefox 77.0.1
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    21
 
0d95fa645411 Firefox 77.0.1
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    22
         # Run Firefox a first time to initialize its profile
0d95fa645411 Firefox 77.0.1
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    23
         runner = FirefoxRunner(profile=profile,
0d95fa645411 Firefox 77.0.1
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    24
                                binary=binary,
0d95fa645411 Firefox 77.0.1
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    25
                                cmdargs=['data:text/html,<script>Quitter.quit()</script>'],
0d95fa645411 Firefox 77.0.1
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    26
                                env=env,