No logging of output when running with --golem on run_on_as_app
Golem has a limit on the output it will process. By having no output
from gradle we should not hit that limit.
Change-Id: Iaac47c44a545f6198cdbe0e62265228e486c0891
diff --git a/tools/run_on_as_app.py b/tools/run_on_as_app.py
index 1548208..1546389 100755
--- a/tools/run_on_as_app.py
+++ b/tools/run_on_as_app.py
@@ -601,7 +601,8 @@
if options.gradle_flags:
args.extend(options.gradle_flags.split(' '))
- stdout = utils.RunGradlew(args, env_vars=env_vars, quiet=options.quiet)
+ stdout = utils.RunGradlew(args, env_vars=env_vars, quiet=options.quiet,
+ logging=not options.golem)
apk_base_name = (archives_base_name
+ (('-' + app.flavor) if app.flavor else '') + '-release')
@@ -653,7 +654,8 @@
'-Pandroid.enableR8.fullMode=' + str(isR8FullMode(shrinker)).lower()]
env_vars = { 'ANDROID_SERIAL': options.emulator_id }
stdout = \
- utils.RunGradlew(args, env_vars=env_vars, quiet=options.quiet, fail=False)
+ utils.RunGradlew(args, env_vars=env_vars, quiet=options.quiet,
+ fail=False, logging=not options.golem)
xml_test_result_dest = os.path.join(out_dir, 'test_result')
as_utils.MoveXMLTestResultFileTo(
diff --git a/tools/utils.py b/tools/utils.py
index 1432ea9..ec830f2 100644
--- a/tools/utils.py
+++ b/tools/utils.py
@@ -129,7 +129,7 @@
print('')
sys.stdout.write(ProgressLogger.UP)
-def RunCmd(cmd, env_vars=None, quiet=False, fail=True):
+def RunCmd(cmd, env_vars=None, quiet=False, fail=True, logging=True):
PrintCmd(cmd, env=env_vars, quiet=quiet)
env = os.environ.copy()
if env_vars:
@@ -137,14 +137,15 @@
process = subprocess.Popen(
cmd, env=env, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
stdout = []
- logger = ProgressLogger(quiet=quiet)
+ logger = ProgressLogger(quiet=quiet) if logging else None
failed = False
while True:
line = process.stdout.readline()
if line != b'':
stripped = line.rstrip()
stdout.append(stripped)
- logger.log(stripped)
+ if logger:
+ logger.log(stripped)
# TODO(christofferqa): r8 should fail with non-zero exit code.
if ('AssertionError:' in stripped
@@ -153,7 +154,8 @@
or 'Compilation failed' in stripped):
failed = True
else:
- logger.done()
+ if logger:
+ logger.done()
exit_code = process.poll()
if exit_code or failed:
for line in stdout:
@@ -165,7 +167,7 @@
def RunGradlew(
args, clean=True, stacktrace=True, use_daemon=False, env_vars=None,
- quiet=False, fail=True):
+ quiet=False, fail=True, logging=True):
cmd = ['./gradlew']
if clean:
assert 'clean' not in args
@@ -177,7 +179,7 @@
assert '--no-daemon' not in args
cmd.append('--no-daemon')
cmd.extend(args)
- return RunCmd(cmd, env_vars=env_vars, quiet=quiet, fail=fail)
+ return RunCmd(cmd, env_vars=env_vars, quiet=quiet, fail=fail, logging=logging)
def IsWindows():
return defines.IsWindows()
