Backed out 2 changesets (bug 1914115, bug 1553850) as requested by Gerard for causing snap canonical builds bustages.

Backed out changeset 375467d198b4 (bug 1914115)
Backed out changeset 7ab954ad623a (bug 1553850)
This commit is contained in:
Tamas Szentpeteri 2024-08-28 21:30:02 +03:00
parent 13f596b419
commit f22a1bdbed
2 changed files with 10 additions and 22 deletions

View File

@ -138,12 +138,18 @@ if __name__ == "__main__":
env["MOZ_CRASHREPORTER_NO_REPORT"] = "1"
env["MOZ_CRASHREPORTER_SHUTDOWN"] = "1"
env["XPCOM_DEBUG_BREAK"] = "warn"
# We disable sandboxing to make writing profiling data actually work
# Bug 1553850 considers fixing this.
env["MOZ_DISABLE_CONTENT_SANDBOX"] = "1"
env["MOZ_DISABLE_RDD_SANDBOX"] = "1"
env["MOZ_DISABLE_SOCKET_PROCESS_SANDBOX"] = "1"
env["MOZ_DISABLE_GPU_SANDBOX"] = "1"
env["MOZ_DISABLE_GMP_SANDBOX"] = "1"
env["MOZ_DISABLE_VR_SANDBOX"] = "1"
env["MOZ_DISABLE_UTILITY_SANDBOX"] = "1"
# Ensure different pids write to different files
# Use absolute path to ensure that Sandbox computes the correct permissions
env["LLVM_PROFILE_FILE"] = os.path.join(
os.getcwd(), "default_%p_random_%m.profraw"
)
env["LLVM_PROFILE_FILE"] = "default_%p_random_%m.profraw"
# Write to an output file if we're running in automation
process_args = {"universal_newlines": True}
@ -207,21 +213,6 @@ if __name__ == "__main__":
get_crashreports(profilePath, name="Profiling run")
sys.exit(ret)
if "UPLOAD_PATH" in env:
should_err = False
print("Verify log for LLVM Profile Error")
for n in range(1, 2):
log = os.path.join(env["UPLOAD_PATH"], f"profile-run-{n}.log")
with open(log) as f:
for line in f.readlines():
if "LLVM Profile Error" in line:
print("Error [{}]: '{}'".format(log, line.strip()))
should_err = True
if should_err:
print("Found some LLVM Profile Error in logs, see above.")
sys.exit(1)
# Try to move the crash reports to the artifacts even if Firefox appears
# to exit successfully, in case there's a crash that doesn't set the
# return code to non-zero for some reason.

View File

@ -3,9 +3,6 @@
set -ex
mkdir -p /builds/worker/artifacts/
# for PGO logs
export UPLOAD_PATH=/builds/worker/artifacts/
mkdir -p /builds/worker/.local/state/snapcraft/
ln -s /builds/worker/artifacts /builds/worker/.local/state/snapcraft/log