From f1390e5ac19593f463816d4606bca1d2f542653c Mon Sep 17 00:00:00 2001 From: Ben Segall Date: Thu, 17 Aug 2023 17:00:11 +0000 Subject: [PATCH] [reclient] Add temporary fix for reclientreport on windows Test: Ran on windows cloudtop and all logs were collected Bug: b/296402157 Change-Id: Ice5e76294d460b2369afd5524d04118a84c38807 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/4791022 Auto-Submit: Ben Segall Reviewed-by: Ramy Medhat Commit-Queue: Ben Segall --- reclientreport.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/reclientreport.py b/reclientreport.py index d7c83298e2..8f514520a8 100644 --- a/reclientreport.py +++ b/reclientreport.py @@ -13,10 +13,25 @@ import argparse import os import subprocess import sys +import tarfile +import tempfile import reclient_helper +# TODO(b/296402157): Remove once reclientreport binary saves all logs on windows +def temp_win_impl__b_296402157(out_dir): + '''Temporary implementation until b/296402157 is fixed''' + log_dir = os.path.abspath(os.path.join(out_dir, '.reproxy_tmp', 'logs')) + with tempfile.NamedTemporaryFile(prefix='reclientreport', + suffix='.tar.gz', + delete=False) as f: + with tarfile.open(fileobj=f, mode='w:gz') as tar: + tar.add(log_dir, arcname=os.path.basename(log_dir)) + print( + f'Created log file at {f.name}. Please attach this to your bug report!') + + def main(): parser = argparse.ArgumentParser(description=__doc__) parser.add_argument("--ninja_out", @@ -26,6 +41,9 @@ def main(): parser.add_argument('args', nargs=argparse.REMAINDER) args, extras = parser.parse_known_args() + if sys.platform.startswith('win'): + temp_win_impl__b_296402157(args.ninja_out) + return if args.args and args.args[0] == '--': args.args.pop(0) if extras: