Better YaIgnore annotations DTCC-954

ref:9387bb845682d3c53923b3cd9ba15f33ce08b83b

3 files changed, 11 insertions, 9 deletions

diff --git a/build/conf/java.ymake.conf b/build/conf/java.ymake.conf
index b1aabacf33b..39db454cda7 100644
--- a/build/conf/java.ymake.conf
+++ b/build/conf/java.ymake.conf
@@ -66,6 +66,8 @@ multimodule JUNIT5 {
         .ALIASES=JAVA_TEST_PEERDIR=PEERDIR JAVA_TEST_EXCLUDE=EXCLUDE
         .PEERDIRSELF=JAR_COMPILATION
 
+        PEERDIR(devtools/jtest-annotations/junit5)
+
         SET(MODULE_TYPE JUNIT5)
     }
     module JAR_COMPILATION: JAR_LIBRARY {
@@ -74,7 +76,7 @@ multimodule JUNIT5 {
         .FINAL_TARGET=no
         .DEFAULT_NAME_GENERATOR=FullPath
 
-        PEERDIR(devtools/junit5-runner build/platform/java/jacoco-agent)
+        PEERDIR(devtools/junit5-runner devtools/jtest-annotations/junit5 build/platform/java/jacoco-agent)
         SET(MODULE_TYPE JUNIT5)
     }
 }
@@ -94,7 +96,7 @@ multimodule JTEST {
         .PEERDIRSELF=JAR_COMPILATION
 
         SET(MODULE_TYPE JTEST)
-        PEERDIR(devtools/junit-runner)
+        PEERDIR(devtools/junit-runner devtools/jtest-annotations/junit4)
         DEPENDENCY_MANAGEMENT(contrib/java/com/google/code/gson/gson/2.8.6 contrib/java/com/beust/jcommander/1.72 contrib/java/junit/junit/4.12)
     }
     module JAR_COMPILATION: JAR_LIBRARY {
@@ -105,7 +107,7 @@ multimodule JTEST {
 
         SET(MODULE_TYPE JTEST)
         DEPENDS(contrib/java/org/sonarsource/scanner/cli/sonar-scanner-cli/2.8)
-        PEERDIR(build/platform/java/jacoco-agent)
+        PEERDIR(build/platform/java/jacoco-agent devtools/jtest-annotations/junit4)
     }
 }
 
diff --git a/build/conf/jbuild.ymake.conf b/build/conf/jbuild.ymake.conf
index 945a7cc9797..ba9068fc27c 100644
--- a/build/conf/jbuild.ymake.conf
+++ b/build/conf/jbuild.ymake.conf
@@ -44,6 +44,7 @@ module JUNIT5: _JAVA_PLACEHOLDER {
     SET(MODULE_TYPE JUNIT5)
     SET(TEST_RUNNER devtools/junit5-runner)
     SET(TEST_CLASSPATH_VALUE ${MODDIR} ${TEST_RUNNER})
+    PEERDIR(devtools/jtest-annotations/junit5)
     # Used as place to add managed dependencies for test execution and take them into account
     # during traverses properly.
     _RUN_JAVA(TOOL ${TEST_RUNNER} OUT fake.out.java_test_cmd)
@@ -71,6 +72,8 @@ module JTEST: _JAVA_PLACEHOLDER {
     # during traverses properly.
     _RUN_JAVA(TOOL ${TEST_RUNNER} OUT fake.out.java_test_cmd)
 
+    PEERDIR(devtools/jtest-annotations/junit4)
+
     # TODO: if <needs_sonar>
     DEPENDS(contrib/java/org/sonarsource/scanner/cli/sonar-scanner-cli/2.8)
     DEPENDS(${TEST_RUNNER})
@@ -94,7 +97,7 @@ module JTEST_FOR: JTEST {
     SET(MODULE_TYPE JTEST_FOR)
     SET(TEST_CLASSPATH_VALUE ${MODDIR} ${TEST_RUNNER} ${UNITTEST_DIR})
 
-    PEERDIR($UNITTEST_DIR)
+    PEERDIR(devtools/jtest-annotations/junit4 $UNITTEST_DIR)
     SET(REALPRJNAME jtest)
     JAVA_TEST()
 }
diff --git a/build/ymake.core.conf b/build/ymake.core.conf
index 61be7e7641a..964814b5f4c 100644
--- a/build/ymake.core.conf
+++ b/build/ymake.core.conf
@@ -8859,15 +8859,12 @@ macro GO_MOCKGEN_MOCKS() {
     RUN_PROGRAM(vendor/github.com/golang/mock/mockgen -package mocks -exec_only ${BINDIR}/gen/gen a.yandex-team.ru/${MOCKGEN_FROM} $MOCKGEN_FIRST${pre=$__COMMA__:MOCKGEN_REST} TOOL ${MODDIR}/gen STDOUT mocks.go)
 }
 
-JAVA_IGNORE_CLASSPATH_CLASH_DEFAULE_VALUE=\
-   ru.yandex.devtools.test.annotations.YaIgnore
-
 # tag:java-specific
-JAVA_IGNORE_CLASSPATH_CLASH_VALUE=$JAVA_IGNORE_CLASSPATH_CLASH_DEFAULE_VALUE
+JAVA_IGNORE_CLASSPATH_CLASH_VALUE=
 ### @usage: JAVA_IGNORE_CLASSPATH_CLASH_FOR([classes])
 ### Ignore classpath clash test fails for classes
 macro JAVA_IGNORE_CLASSPATH_CLASH_FOR(Args...) {
-    SET_APPEND(JAVA_IGNORE_CLASSPATH_CLASH_VALUE $Args $JAVA_IGNORE_CLASSPATH_CLASH_DEFAULE_VALUE)
+    SET_APPEND(JAVA_IGNORE_CLASSPATH_CLASH_VALUE $Args)
 }
 
 # tag:python-specific