diff options
| author | Alexander Smirnov <[email protected]> | 2024-04-08 08:20:18 +0000 |
|---|---|---|
| committer | Alexander Smirnov <[email protected]> | 2024-04-08 08:20:18 +0000 |
| commit | 40921060b649610421ba31cbe78cd6be2e222929 (patch) | |
| tree | a0d3eaf0995dd00e7970e4a54a8fb11ca311c21f /library/python/cpp_test/test_cpp.py | |
| parent | 3fa95b9777601584da35d5925d7908f283f671a9 (diff) | |
| parent | 72eeab5172756159750eef875745e2a6f5b0004f (diff) | |
Merge branch 'rightlib' into mergelibs-240408-0819
Diffstat (limited to 'library/python/cpp_test/test_cpp.py')
| -rw-r--r-- | library/python/cpp_test/test_cpp.py | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/library/python/cpp_test/test_cpp.py b/library/python/cpp_test/test_cpp.py index efa10ea2833..b4c78f82716 100644 --- a/library/python/cpp_test/test_cpp.py +++ b/library/python/cpp_test/test_cpp.py @@ -10,20 +10,16 @@ from library.python.testing.style import rules import library.python.resource as lpr -STYLE_CONFIG_JSON_14 = json.dumps(yaml.safe_load(lpr.find('resfs/file/config.clang-format'))) -STYLE_CONFIG_JSON_16 = json.dumps(yaml.safe_load(lpr.find('resfs/file/config.clang-format-16'))) +# keep in sync with the logic in https://a.yandex-team.ru/arcadia/devtools/ya/handlers/style/cpp_style.py?rev=r12543375#L21 +STYLE_CONFIG_JSON = json.dumps(yaml.safe_load(lpr.find('resfs/file/config.clang-format'))) RES_FILE_PREFIX = '/cpp_style/files/' CHECKED_PATHS = list(lpr.iterkeys(RES_FILE_PREFIX, strip_prefix=True)) def check_style(filename, actual_source): - try: - clang_format_binary = yatest.common.binary_path('contrib/libs/clang14/tools/clang-format/clang-format') - config = STYLE_CONFIG_JSON_14 - except Exception: - clang_format_binary = yatest.common.binary_path('contrib/libs/clang16/tools/clang-format/clang-format') - config = STYLE_CONFIG_JSON_16 + clang_format_binary = yatest.common.binary_path('contrib/libs/clang16/tools/clang-format/clang-format') + config = STYLE_CONFIG_JSON command = [clang_format_binary, '-assume-filename=' + filename, '-style=' + config] styled_source = subprocess.check_output(command, input=actual_source) |