diff options
author | dimdim11 <dimdim11@yandex-team.com> | 2023-11-24 11:12:03 +0300 |
---|---|---|
committer | dimdim11 <dimdim11@yandex-team.com> | 2023-11-24 11:52:17 +0300 |
commit | c5284478af104d82c4d84a5d99bf0a51ecd2ca63 (patch) | |
tree | 1866d11e43f2a6edf6a248cbf4601319b2c18548 /build | |
parent | efe5b5f8d2da503eda4d172f6f2e85aac64ba6a6 (diff) | |
download | ydb-c5284478af104d82c4d84a5d99bf0a51ecd2ca63.tar.gz |
Add env semantic
Diffstat (limited to 'build')
-rw-r--r-- | build/conf/java.conf | 4 | ||||
-rw-r--r-- | build/export_generators/gradle/generator.toml | 1 | ||||
-rw-r--r-- | build/export_generators/hardcoded-cmake/generator.toml | 1 | ||||
-rw-r--r-- | build/export_generators/ide-gradle/generator.toml | 1 | ||||
-rw-r--r-- | build/ymake.core.conf | 2 |
5 files changed, 7 insertions, 2 deletions
diff --git a/build/conf/java.conf b/build/conf/java.conf index c44a9e861d..cd9432e1a5 100644 --- a/build/conf/java.conf +++ b/build/conf/java.conf @@ -74,7 +74,7 @@ multimodule JAVA_PROGRAM { } } -BUILD_JUNIT5_JAR_SEM=$BUILD_JAR_SEM && junit5_test +BUILD_JUNIT5_JAR_SEM=$BUILD_JAR_SEM && junit5_test && env $ENV multimodule JUNIT5 { # ATTENTION ya ide idea relies on this submodule name to find scope of `ya make` build before project generation @@ -129,7 +129,7 @@ multimodule JUNIT5 { } } -BUILD_JUNIT4_JAR_SEM=$BUILD_JAR_SEM && junit4_test +BUILD_JUNIT4_JAR_SEM=$BUILD_JAR_SEM && junit4_test && env $ENV multimodule JTEST { # ATTENTION ya ide idea relies on this submodule name to find scope of `ya make` build before project generation diff --git a/build/export_generators/gradle/generator.toml b/build/export_generators/gradle/generator.toml index 5040216c73..dd7d005ec9 100644 --- a/build/export_generators/gradle/generator.toml +++ b/build/export_generators/gradle/generator.toml @@ -31,6 +31,7 @@ peers_closure="list" peers_closure_coords="list" excludes_rules="list" exclude="list" +env="list" [attrs.root] diff --git a/build/export_generators/hardcoded-cmake/generator.toml b/build/export_generators/hardcoded-cmake/generator.toml index 9800de5177..aea10c51a1 100644 --- a/build/export_generators/hardcoded-cmake/generator.toml +++ b/build/export_generators/hardcoded-cmake/generator.toml @@ -14,6 +14,7 @@ target_sources_custom="list" target_ragel_lexers="list" target_yasm_source="list" add_global_library_for="list" +env="list" [[rules]] attrs=["vcs_info", "target_joined_source", "target_sources_custom", "target_ragel_lexers", "target_yasm_source", "add_global_library_for"] diff --git a/build/export_generators/ide-gradle/generator.toml b/build/export_generators/ide-gradle/generator.toml index f882805933..826532e95b 100644 --- a/build/export_generators/ide-gradle/generator.toml +++ b/build/export_generators/ide-gradle/generator.toml @@ -30,6 +30,7 @@ peers_closure="list" peers_closure_coords="list" excludes_rules="list" exclude="list" +env="list" jar_source_set="list" [attrs.root] diff --git a/build/ymake.core.conf b/build/ymake.core.conf index d700f76b85..c7471b8475 100644 --- a/build/ymake.core.conf +++ b/build/ymake.core.conf @@ -1195,6 +1195,7 @@ UNITTEST_SEM=$CPP_PROGRAM_SEM \ && add_yunittest NAME $REALPRJNAME TEST_TARGET $REALPRJNAME TEST_ARG --print-before-suite --print-before-test --fork-tests --print-times --show-fails \ && set_yunittest_property TEST $REALPRJNAME PROPERTY LABELS $TEST_SIZE_NAME $FILTER_ONLY_TEST_TAGS \ && add_ytest_requirements $REALPRJNAME $DEFAULT_REQUIREMENTS $TEST_REQUIREMENTS_VALUE \ + && env PRIVATE $ENV \ $_TEST_TIMEOUT_SEM # tag:test @@ -1248,6 +1249,7 @@ GTEST_SEM=$CPP_PROGRAM_SEM \ && add_test NAME $REALPRJNAME COMMAND $REALPRJNAME \ && set_property TEST $REALPRJNAME PROPERTY LABELS $TEST_SIZE_NAME $FILTER_ONLY_TEST_TAGS \ && add_test_requirements $REALPRJNAME $DEFAULT_REQUIREMENTS $TEST_REQUIREMENTS_VALUE \ + && env PRIVATE $ENV \ $_TEST_TIMEOUT_SEM # tag:cpp-specific tag:test |