Remove forgotten feature switch: YMAKE_JAVA_TEST

commit_hash:baacdf6da887ea8415dfcc2d6d7063388b7c7aee

3 files changed, 12 insertions, 25 deletions

diff --git a/build/conf/java.conf b/build/conf/java.conf
index 86e6b95bd74..66445447179 100644
--- a/build/conf/java.conf
+++ b/build/conf/java.conf
@@ -1174,7 +1174,6 @@ module JAR_LIBRARY: _COMPILABLE_JAR_BASE {
     }
 
     SET(MODULE_TYPE JAVA_LIBRARY)
-    ENABLE(YMAKE_JAVA_TEST)
     _ADD_KOTLIN_STYLE_CHECKS($(BUILD_ROOT)/$MODDIR/all-kt-sources.txt REQUIREMENTS cpu:2)
     _ADD_JAVA_STYLE_CHECKS($(BUILD_ROOT)/$MODDIR/lint-java.srclst::$(SOURCE_ROOT))
     _ADD_DETEKT_REPORT_CHECK($(BUILD_ROOT)/$MODDIR/detekt-report.xml)
@@ -1276,7 +1275,6 @@ module _JAR_RUNNABLE: _COMPILABLE_JAR_BASE {
 
 # tag:java-specific
 LINK_JAR_TEST=${hide:JAVA_FAKEID} ${WRITER_PY} --file ${BINDIR}/run-bf.txt -Q -m --ya-start-command-file ${ext=.jar:MANAGED_PEERS_CLOSURE} --ya-end-command-file && ${YMAKE_PYTHON} ${input:"build/scripts/make_manifest_from_bf.py"} ${BINDIR}/run-bf.txt ${TARGET} ${hide;kv:"p JT"}
-YMAKE_JAVA_TEST=
 module _JAR_TEST: _COMPILABLE_JAR_BASE {
     .FINAL_TARGET=yes
     .CMD=LINK_JAR_TEST
@@ -1284,7 +1282,6 @@ module _JAR_TEST: _COMPILABLE_JAR_BASE {
     CONSUME_NON_MANAGEABLE_PEERS=yes
 
     SET(MODULE_SUFFIX .test.cp.jar)
-    ENABLE(YMAKE_JAVA_TEST)
     JAVA_TEST()
     CHECK_PROVIDES()
     SET_APPEND(_MAKEFILE_INCLUDE_LIKE_DEPS canondata/result.json)
diff --git a/build/plugins/_dart_fields.py b/build/plugins/_dart_fields.py
index 9ba0fcb9da3..aa1b5d9a161 100644
--- a/build/plugins/_dart_fields.py
+++ b/build/plugins/_dart_fields.py
@@ -360,10 +360,8 @@ class Classpath:
 
     @classmethod
     def value(cls, unit, flat_args, spec_args):
-        ymake_java_test = unit.get('YMAKE_JAVA_TEST') == 'yes'
-        if ymake_java_test:
-            value = '$B/{}/{}.jar ${{DART_CLASSPATH}}'.format(unit.get('MODDIR'), unit.get('REALPRJNAME'))
-            return {cls.KEY: value}
+        value = '$B/{}/{}.jar ${{DART_CLASSPATH}}'.format(unit.get('MODDIR'), unit.get('REALPRJNAME'))
+        return {cls.KEY: value}
 
 
 class ConfigPath:
@@ -847,10 +845,8 @@ class TestClasspath:
 
     @classmethod
     def value(cls, unit, flat_args, spec_args):
-        ymake_java_test = unit.get('YMAKE_JAVA_TEST') == 'yes'
-        if ymake_java_test:
-            value = '${DART_CLASSPATH}'
-            return {cls.KEY: value}
+        value = '${DART_CLASSPATH}'
+        return {cls.KEY: value}
 
 
 class TestClasspathDeps:
@@ -858,9 +854,7 @@ class TestClasspathDeps:
 
     @classmethod
     def value(cls, unit, flat_args, spec_args):
-        ymake_java_test = unit.get('YMAKE_JAVA_TEST') == 'yes'
-        if ymake_java_test:
-            return {cls.KEY: '${DART_CLASSPATH_DEPS}'}
+        return {cls.KEY: '${DART_CLASSPATH_DEPS}'}
 
 
 class TestCwd:
@@ -930,9 +924,7 @@ class TestData:
 
     @classmethod
     def java_style(cls, unit, flat_args, spec_args):
-        ymake_java_test = unit.get('YMAKE_JAVA_TEST') == 'yes'
-        if ymake_java_test:
-            return {cls.KEY: java_srcdirs_to_data(unit, 'ALL_SRCDIRS')}
+        return {cls.KEY: java_srcdirs_to_data(unit, 'ALL_SRCDIRS')}
 
     @classmethod
     def from_unit_with_canonical(cls, unit, flat_args, spec_args):
@@ -1219,13 +1211,11 @@ class TestJar:
 
     @classmethod
     def value(cls, unit, flat_args, spec_args):
-        ymake_java_test = unit.get('YMAKE_JAVA_TEST') == 'yes'
-        if ymake_java_test:
-            if unit.get('UNITTEST_DIR'):
-                value = '${UNITTEST_MOD}'
-            else:
-                value = '{}/{}.jar'.format(unit.get('MODDIR'), unit.get('REALPRJNAME'))
-            return {cls.KEY: value}
+        if unit.get('UNITTEST_DIR'):
+            value = '${UNITTEST_MOD}'
+        else:
+            value = '{}/{}.jar'.format(unit.get('MODDIR'), unit.get('REALPRJNAME'))
+        return {cls.KEY: value}
 
 
 class TestName:
diff --git a/build/plugins/ytest.py b/build/plugins/ytest.py
index ab3f227bea8..33eeac4403f 100644
--- a/build/plugins/ytest.py
+++ b/build/plugins/ytest.py
@@ -759,7 +759,7 @@ def onadd_check(unit, *args):
         check_resource(unit, *args)
     elif check_type == "ktlint":
         ktlint(unit, *args)
-    elif check_type == "JAVA_STYLE" and (unit.get('YMAKE_JAVA_TEST') != 'yes' or unit.get('ALL_SRCDIRS')):
+    elif check_type == "JAVA_STYLE" and unit.get('ALL_SRCDIRS'):
         java_style(unit, *args)
     elif check_type == "gofmt":
         gofmt(unit, *args)