diff options
| author | arcadia-devtools <[email protected]> | 2022-02-21 15:43:19 +0300 |
|---|---|---|
| committer | arcadia-devtools <[email protected]> | 2022-02-21 15:43:19 +0300 |
| commit | 178d0e7645de04588522cd6287777cd7a2f065f9 (patch) | |
| tree | 19adf240d2ef3b75bf3671aeeaa87eb15bfc0b21 /build/plugins/ytest.py | |
| parent | c161c2c45e7a70edd43d8fb8b4de942d62db5690 (diff) | |
intermediate changes
ref:489c487087adbbffdc59e875df6227bdb2f0bc23
Diffstat (limited to 'build/plugins/ytest.py')
| -rw-r--r-- | build/plugins/ytest.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/build/plugins/ytest.py b/build/plugins/ytest.py index 149c0a3ace3..73be62fb6b1 100644 --- a/build/plugins/ytest.py +++ b/build/plugins/ytest.py @@ -579,7 +579,7 @@ def onadd_check(unit, *args): fork_mode = unit.get('TEST_FORK_MODE') or '' if ymake_java_test: extra_test_data = java_srcdirs_to_data(unit, 'ALL_SRCDIRS') - extra_test_dart_data['JDK_RESOURCE'] = 'JDK' + (unit.get('JDK_VERSION') or '_DEFAULT') + extra_test_dart_data['JDK_RESOURCE'] = 'JDK' + (unit.get('JDK_VERSION') or unit.get('JDK_REAL_VERSION') or '_DEFAULT') elif check_type == "gofmt": script_rel_path = check_type go_files = flat_args[1:] @@ -859,8 +859,8 @@ def onjava_test(unit, *args): 'SKIP_TEST': unit.get('SKIP_TEST_VALUE') or '', 'JAVA_CLASSPATH_CMD_TYPE': java_cp_arg_type, 'NO_JBUILD': 'yes' if ymake_java_test else 'no', - 'JDK_RESOURCE': 'JDK' + (unit.get('JDK_VERSION') or '_DEFAULT'), - 'JDK_FOR_TESTS': 'JDK' + (unit.get('JDK_VERSION') or '_DEFAULT') + '_FOR_TESTS', + 'JDK_RESOURCE': 'JDK' + (unit.get('JDK_VERSION') or unit.get('JDK_REAL_VERSION') or '_DEFAULT'), + 'JDK_FOR_TESTS': 'JDK' + (unit.get('JDK_VERSION') or unit.get('JDK_REAL_VERSION') or '_DEFAULT') + '_FOR_TESTS', } test_classpath_origins = unit.get('TEST_CLASSPATH_VALUE') if test_classpath_origins: |