aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormiroslav2 <miroslav2@yandex-team.com>2023-10-27 12:31:05 +0300
committermiroslav2 <miroslav2@yandex-team.com>2023-10-27 13:03:17 +0300
commit41f9259d7bfe16c131b25f12a42ac2ecbeda3e89 (patch)
treefb49bee0159fb5c5d0ff18e8bddac69e33392b93
parent206239ea12d280c0815c5dbdea8a5f42fd5271b2 (diff)
downloadydb-41f9259d7bfe16c131b25f12a42ac2ecbeda3e89.tar.gz
Add and run JDK tests on Mac OS Intel and Mac OS Apple Silicon using Arcadia CI, fix LINT for JDK 21
-rw-r--r--build/platform/java/jdk/jdk11/ya.make7
-rw-r--r--build/platform/java/jdk/jdk17/ya.make7
-rw-r--r--build/platform/java/jdk/jdk19/ya.make7
-rw-r--r--build/platform/java/jdk/jdk20/ya.make7
-rw-r--r--build/platform/java/jdk/jdk21/ya.make7
-rw-r--r--build/platform/java/jdk/ya.make4
-rw-r--r--build/platform/java/jstyle_lib/ya.make2
7 files changed, 40 insertions, 1 deletions
diff --git a/build/platform/java/jdk/jdk11/ya.make b/build/platform/java/jdk/jdk11/ya.make
index a6021b2d6b..088f30ba20 100644
--- a/build/platform/java/jdk/jdk11/ya.make
+++ b/build/platform/java/jdk/jdk11/ya.make
@@ -17,3 +17,10 @@ IF (HOST_OS_LINUX AND SANITIZER_TYPE == "address" AND NOT OPENSOURCE)
ENDIF()
END()
+
+IF (AUTOCHECK)
+ RECURSE_FOR_TESTS(ut)
+ENDIF()
+IF(YA_IDE_IDEA)
+ RECURSE_FOR_TESTS(ut)
+ENDIF()
diff --git a/build/platform/java/jdk/jdk17/ya.make b/build/platform/java/jdk/jdk17/ya.make
index 22cf243491..3a1ee069d6 100644
--- a/build/platform/java/jdk/jdk17/ya.make
+++ b/build/platform/java/jdk/jdk17/ya.make
@@ -13,3 +13,10 @@ IF (WITH_JDK17_URI)
ENDIF()
END()
+
+IF (AUTOCHECK)
+ RECURSE_FOR_TESTS(ut)
+ENDIF()
+IF(YA_IDE_IDEA)
+ RECURSE_FOR_TESTS(ut)
+ENDIF()
diff --git a/build/platform/java/jdk/jdk19/ya.make b/build/platform/java/jdk/jdk19/ya.make
index 8663058ae1..b3d8780e05 100644
--- a/build/platform/java/jdk/jdk19/ya.make
+++ b/build/platform/java/jdk/jdk19/ya.make
@@ -8,3 +8,10 @@ IF (WITH_JDK19_URI)
ENDIF()
END()
+
+IF (AUTOCHECK)
+ RECURSE_FOR_TESTS(ut)
+ENDIF()
+IF(YA_IDE_IDEA)
+ RECURSE_FOR_TESTS(ut)
+ENDIF()
diff --git a/build/platform/java/jdk/jdk20/ya.make b/build/platform/java/jdk/jdk20/ya.make
index 7cd1dc172f..66246045a4 100644
--- a/build/platform/java/jdk/jdk20/ya.make
+++ b/build/platform/java/jdk/jdk20/ya.make
@@ -13,3 +13,10 @@ IF (WITH_JDK20_URI)
ENDIF()
END()
+
+IF (AUTOCHECK)
+ RECURSE_FOR_TESTS(ut)
+ENDIF()
+IF(YA_IDE_IDEA)
+ RECURSE_FOR_TESTS(ut)
+ENDIF()
diff --git a/build/platform/java/jdk/jdk21/ya.make b/build/platform/java/jdk/jdk21/ya.make
index de58a100ba..b47725dc31 100644
--- a/build/platform/java/jdk/jdk21/ya.make
+++ b/build/platform/java/jdk/jdk21/ya.make
@@ -13,3 +13,10 @@ IF (WITH_JDK21_URI)
ENDIF()
END()
+
+IF (AUTOCHECK)
+ RECURSE_FOR_TESTS(ut)
+ENDIF()
+IF(YA_IDE_IDEA)
+ RECURSE_FOR_TESTS(ut)
+ENDIF()
diff --git a/build/platform/java/jdk/ya.make b/build/platform/java/jdk/ya.make
index 3c3a23a63f..4e2df0ed36 100644
--- a/build/platform/java/jdk/ya.make
+++ b/build/platform/java/jdk/ya.make
@@ -48,3 +48,7 @@ RECURSE(
jdk21
testing
)
+
+IF(YA_IDE_IDEA)
+ RECURSE(base_jdk_test)
+ENDIF()
diff --git a/build/platform/java/jstyle_lib/ya.make b/build/platform/java/jstyle_lib/ya.make
index 234271639b..e83ebba6ca 100644
--- a/build/platform/java/jstyle_lib/ya.make
+++ b/build/platform/java/jstyle_lib/ya.make
@@ -5,7 +5,7 @@ OWNER(heretic)
IF (USE_SYSTEM_JSTYLE_LIB)
MESSAGE(WARNING System java codestyle library $USE_SYSTEM_JSTYLE_LIB will be used)
ELSE()
- DECLARE_EXTERNAL_RESOURCE(JSTYLE_LIB sbr:4978388684)
+ DECLARE_EXTERNAL_RESOURCE(JSTYLE_LIB sbr:5310288728)
ENDIF()
END()