aboutsummaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorsvidyuk <svidyuk@yandex-team.com>2023-11-24 13:37:43 +0300
committersvidyuk <svidyuk@yandex-team.com>2023-11-24 14:44:06 +0300
commit2bb1b2fb5d0028e709fb516f0c88c3a66ba6a457 (patch)
treeaddbbf6332d3df6d6a657d3c7b8a4159ba58be63 /build
parent850c48ccf9cadbf8096c6b5015e064c38d0d912e (diff)
downloadydb-2bb1b2fb5d0028e709fb516f0c88c3a66ba6a457.tar.gz
Revert commit rXXXXXX,Add env semantic
Diffstat (limited to 'build')
-rw-r--r--build/conf/java.conf4
-rw-r--r--build/export_generators/gradle/generator.toml1
-rw-r--r--build/export_generators/hardcoded-cmake/generator.toml1
-rw-r--r--build/export_generators/ide-gradle/generator.toml1
-rw-r--r--build/ymake.core.conf2
5 files changed, 2 insertions, 7 deletions
diff --git a/build/conf/java.conf b/build/conf/java.conf
index cd9432e1a5..c44a9e861d 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 && env $ENV
+BUILD_JUNIT5_JAR_SEM=$BUILD_JAR_SEM && junit5_test
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 && env $ENV
+BUILD_JUNIT4_JAR_SEM=$BUILD_JAR_SEM && junit4_test
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 dd7d005ec9..5040216c73 100644
--- a/build/export_generators/gradle/generator.toml
+++ b/build/export_generators/gradle/generator.toml
@@ -31,7 +31,6 @@ 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 aea10c51a1..9800de5177 100644
--- a/build/export_generators/hardcoded-cmake/generator.toml
+++ b/build/export_generators/hardcoded-cmake/generator.toml
@@ -14,7 +14,6 @@ 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 826532e95b..f882805933 100644
--- a/build/export_generators/ide-gradle/generator.toml
+++ b/build/export_generators/ide-gradle/generator.toml
@@ -30,7 +30,6 @@ 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 c7471b8475..d700f76b85 100644
--- a/build/ymake.core.conf
+++ b/build/ymake.core.conf
@@ -1195,7 +1195,6 @@ 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
@@ -1249,7 +1248,6 @@ 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