diff options
| author | thegeorg <thegeorg@yandex-team.com> | 2023-09-15 19:22:08 +0300 |
|---|---|---|
| committer | thegeorg <thegeorg@yandex-team.com> | 2023-09-15 19:43:17 +0300 |
| commit | d75c311f1ac747ca251904ec1fd12688bcd136b3 (patch) | |
| tree | bb7334643fdaaabbce3d66dd3d90b6a43e60742d /library | |
| parent | 6ff4e6332a1e3daf26f59b0520a3e8932c1ee538 (diff) | |
| download | ydb-d75c311f1ac747ca251904ec1fd12688bcd136b3.tar.gz | |
Remove references to clang-format-12
Diffstat (limited to 'library')
| -rw-r--r-- | library/python/cpp_test/test_cpp.py | 11 | ||||
| -rw-r--r-- | library/python/cpp_test/ya.make | 3 |
2 files changed, 4 insertions, 10 deletions
diff --git a/library/python/cpp_test/test_cpp.py b/library/python/cpp_test/test_cpp.py index 0882dd541b..674feb45e9 100644 --- a/library/python/cpp_test/test_cpp.py +++ b/library/python/cpp_test/test_cpp.py @@ -10,20 +10,15 @@ from library.python.testing.style import rules import library.python.resource as lpr -STYLE_CONFIG_JSON_12 = json.dumps(yaml.safe_load(lpr.find('/cpp_style/config/12'))) -STYLE_CONFIG_JSON_14 = json.dumps(yaml.safe_load(lpr.find('/cpp_style/config/14'))) +STYLE_CONFIG_JSON = json.dumps(yaml.safe_load(lpr.find('/cpp_style/config'))) 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/clang12/tools/clang-format/clang-format') - config = STYLE_CONFIG_JSON_12 - except Exception: - clang_format_binary = yatest.common.binary_path('contrib/libs/clang14/tools/clang-format/clang-format') - config = STYLE_CONFIG_JSON_14 + clang_format_binary = yatest.common.binary_path('contrib/libs/clang14/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) diff --git a/library/python/cpp_test/ya.make b/library/python/cpp_test/ya.make index c325e2ad5f..6267cbf630 100644 --- a/library/python/cpp_test/ya.make +++ b/library/python/cpp_test/ya.make @@ -12,8 +12,7 @@ TEST_SRCS( ) RESOURCE( - devtools/ya/handlers/style/style_config /cpp_style/config/12 - devtools/ya/handlers/style/style_config_14 /cpp_style/config/14 + devtools/ya/handlers/style/style_config /cpp_style/config ) END() |