Merge branch 'stable-2.12'

* stable-2.12:
  Buck: Stop spamming standard output on unit test failures

Change-Id: I31d870318a126e7621d56a0eed7aacf47565b4b5
This commit is contained in:
David Pursehouse 2015-11-13 09:32:57 -08:00
commit 117517d39e

View File

@ -27,6 +27,7 @@ from multiprocessing import cpu_count
# Set defaults on java rules: # Set defaults on java rules:
# - Add AutoValue annotation processing support. # - Add AutoValue annotation processing support.
# - Treat source files as UTF-8. # - Treat source files as UTF-8.
# - std_out_log_level = info (the default is too spammy)
_buck_java_library = java_library _buck_java_library = java_library
def java_library(*args, **kwargs): def java_library(*args, **kwargs):
@ -36,9 +37,9 @@ def java_library(*args, **kwargs):
_buck_java_test = java_test _buck_java_test = java_test
def java_test(*args, **kwargs): def java_test(*args, **kwargs):
_munge_args(kwargs) _munge_args(kwargs)
_do_not_spam_std_out(kwargs)
_buck_java_test(*args, **kwargs) _buck_java_test(*args, **kwargs)
# Munge kwargs to set Gerrit-specific defaults. # Munge kwargs to set Gerrit-specific defaults.
def _munge_args(kwargs): def _munge_args(kwargs):
_set_auto_value(kwargs) _set_auto_value(kwargs)
@ -56,6 +57,11 @@ def _set_extra_arguments(kwargs):
extra_args.extend(['-encoding', 'UTF-8']) extra_args.extend(['-encoding', 'UTF-8'])
def _do_not_spam_std_out(kwargs):
level = 'std_out_log_level'
if level not in kwargs:
kwargs[level] = 'INFO'
def _set_auto_value(kwargs): def _set_auto_value(kwargs):
apk = 'annotation_processors' apk = 'annotation_processors'
if apk not in kwargs: if apk not in kwargs: