diff options
| author | dimdim11 <dimdim11@yandex-team.com> | 2025-04-24 23:18:58 +0300 |
|---|---|---|
| committer | dimdim11 <dimdim11@yandex-team.com> | 2025-04-24 23:35:19 +0300 |
| commit | f018ee2eec2bd36560033ee2f33cef5bf9ee58dc (patch) | |
| tree | a19c4c5d2d1c2d17ca8cfe995fe8299e477e9535 | |
| parent | c131fc365fb38ed44c86e092d1dc0aabbceaac63 (diff) | |
| download | ydb-f018ee2eec2bd36560033ee2f33cef5bf9ee58dc.tar.gz | |
Use junit4/5 semantics for java tests
Use junit4/5 semantics for java tests
commit_hash:def6b37d434f8759c3ba83213b5baf2f1af85220
| -rw-r--r-- | build/conf/java.conf | 6 | ||||
| -rw-r--r-- | build/export_generators/gradle/generator.toml | 10 | ||||
| -rw-r--r-- | build/export_generators/ide-gradle/generator.toml | 10 |
3 files changed, 25 insertions, 1 deletions
diff --git a/build/conf/java.conf b/build/conf/java.conf index 8bf508fa5ad..31a84a38eca 100644 --- a/build/conf/java.conf +++ b/build/conf/java.conf @@ -181,6 +181,7 @@ multimodule JUNIT5 { PEERDIR+=devtools/jtest-annotations/junit5 } SET(MODULE_TYPE JUNIT5) + SET(_SEM_JAR_TARGET junit5) when ($OPENSOURCE == "yes" && $AUTOCHECK == "yes") { # FIXME: Replace AUTOCHECK == yes with _not a host platform_ check after YMAKE-218 @@ -230,6 +231,7 @@ multimodule JTEST { .SEM=_BUILD_JUNIT4_JAR_SEM .IGNORED=JUNIT_TESTS_JAR + SET(_SEM_JAR_TARGET junit4) SET(MODULE_TYPE JTEST) DEPENDS(contrib/java/org/sonarsource/scanner/cli/sonar-scanner-cli/2.8) @@ -978,9 +980,11 @@ _DO_GRADLE_EXPORT_PUBLISHING_SEM= \ && publish_group $MAVEN_EXPORT_GROUP_ID \ && publish_version $PUBLISH_MAVEN_VERSION +_SEM_JAR_TARGET=jar + _BUILD_JAR_SEM= \ ${hide:TARGET} ${hide:AUTO_INPUT} ${hide:APPLIED_EXCLUDES} \ - jar $MODDIR $REALPRJNAME \ + $_SEM_JAR_TARGET $MODDIR $REALPRJNAME \ && consumer-classpath $EXPORT_GRADLE_CLASSPATH \ && consumer-jar ${MODDIR}/${REALPRJNAME}.jar \ && consumer-type library \ diff --git a/build/export_generators/gradle/generator.toml b/build/export_generators/gradle/generator.toml index 219ce56c108..be72a215542 100644 --- a/build/export_generators/gradle/generator.toml +++ b/build/export_generators/gradle/generator.toml @@ -16,6 +16,16 @@ template="build.gradle.kts.jinja" [targets.jar_proto] template={ path="build.gradle.kts.proto.jinja", dest="build.gradle.kts" } +[targets.junit4] +template="build.gradle.kts.jinja" +is_test = true +is_extra_target = true + +[targets.junit5] +template="build.gradle.kts.jinja" +is_test = true +is_extra_target = true + [attrs.target] # DEPRECATED annotation_processors="list" diff --git a/build/export_generators/ide-gradle/generator.toml b/build/export_generators/ide-gradle/generator.toml index e673c546993..e085cd71b68 100644 --- a/build/export_generators/ide-gradle/generator.toml +++ b/build/export_generators/ide-gradle/generator.toml @@ -19,6 +19,16 @@ template="build.gradle.kts.jinja" [targets.jar_proto] template={ path="build.gradle.kts.proto.jinja", dest="build.gradle.kts" } +[targets.junit4] +template="build.gradle.kts.jinja" +is_test = true +is_extra_target = true + +[targets.junit5] +template="build.gradle.kts.jinja" +is_test = true +is_extra_target = true + [attrs.target] # DEPRECATED annotation_processors="list" |