diff options
| author | svidyuk <svidyuk@yandex-team.com> | 2024-10-15 05:07:44 +0300 |
|---|---|---|
| committer | svidyuk <svidyuk@yandex-team.com> | 2024-10-15 05:23:29 +0300 |
| commit | 35320781ed829291a3d21cccf3f120edee2a7f1d (patch) | |
| tree | c8dcca6c6f55399544aa8a74fc05a2fe07f27c38 | |
| parent | ce49e630dfaccc2b71439b24fa796c0d6bd34410 (diff) | |
| download | ydb-35320781ed829291a3d21cccf3f120edee2a7f1d.tar.gz | |
Remove TEST_CLASSPATH_VALUE which is never set to some nonempty value
commit_hash:251f100d789e57861ed91af2b1318537a09af3c2
| -rw-r--r-- | build/conf/java.conf | 4 | ||||
| -rw-r--r-- | build/plugins/_dart_fields.py | 16 |
2 files changed, 4 insertions, 16 deletions
diff --git a/build/conf/java.conf b/build/conf/java.conf index 5dc361a3b1..69d8a82566 100644 --- a/build/conf/java.conf +++ b/build/conf/java.conf @@ -1833,10 +1833,6 @@ MANAGED_PEERS_CLOSURE= MANAGEABLE_PEERS_ROOTS=contrib/java HAS_MANAGEABLE_PEERS=no PROPAGATES_MANAGEABLE_PEERS=no -# All items of this list must be PEERS, GHOST PEERS or TOOLS of the test module or module itself. -# All items of this list must has at least one of HAS_MANAGEABLE_PEERS or PROPAGATES_MANAGEABLE_PEERS flags set yes. -# This variable is used by JUnit tests but not TestNG. -TEST_CLASSPATH_VALUE= # Calculated and replaced by ymake can be used in DART DATA TEST_CLASSPATH_MANAGED= diff --git a/build/plugins/_dart_fields.py b/build/plugins/_dart_fields.py index 423eceb8c9..2b556e2073 100644 --- a/build/plugins/_dart_fields.py +++ b/build/plugins/_dart_fields.py @@ -847,12 +847,8 @@ class TestClasspath: @classmethod def value(cls, unit, flat_args, spec_args): - test_classpath_origins = unit.get('TEST_CLASSPATH_VALUE') ymake_java_test = unit.get('YMAKE_JAVA_TEST') == 'yes' - if test_classpath_origins: - value = '${TEST_CLASSPATH_MANAGED}' - return {cls.KEY: value} - elif ymake_java_test: + if ymake_java_test: value = '${DART_CLASSPATH}' return {cls.KEY: value} @@ -862,9 +858,8 @@ class TestClasspathDeps: @classmethod def value(cls, unit, flat_args, spec_args): - test_classpath_origins = unit.get('TEST_CLASSPATH_VALUE') ymake_java_test = unit.get('YMAKE_JAVA_TEST') == 'yes' - if not test_classpath_origins and ymake_java_test: + if ymake_java_test: return {cls.KEY: '${DART_CLASSPATH_DEPS}'} @@ -873,9 +868,7 @@ class TestClasspathOrigins: @classmethod def value(cls, unit, flat_args, spec_args): - test_classpath_origins = unit.get('TEST_CLASSPATH_VALUE') - if test_classpath_origins: - return {cls.KEY: test_classpath_origins} + return None class TestCwd: @@ -1234,9 +1227,8 @@ class TestJar: @classmethod def value(cls, unit, flat_args, spec_args): - test_classpath_origins = unit.get('TEST_CLASSPATH_VALUE') ymake_java_test = unit.get('YMAKE_JAVA_TEST') == 'yes' - if not test_classpath_origins and ymake_java_test: + if ymake_java_test: if unit.get('UNITTEST_DIR'): value = '${UNITTEST_MOD}' else: |