diff options
| author | arcadia-devtools <arcadia-devtools@yandex-team.ru> | 2022-02-16 14:46:18 +0300 |
|---|---|---|
| committer | arcadia-devtools <arcadia-devtools@yandex-team.ru> | 2022-02-16 14:46:18 +0300 |
| commit | 2f8ea7e2648c1624b5c1af79efe506096c4ce519 (patch) | |
| tree | 6d3fdfa9d3804e62b6653d7750bed1179e52f4e5 | |
| parent | 91baa58196a4f481f246c747dc20c9b25ff96cb4 (diff) | |
| download | ydb-2f8ea7e2648c1624b5c1af79efe506096c4ce519.tar.gz | |
intermediate changes
ref:e91b0f9a6dec6990c5770860c0d8a8e7468727d2
| -rw-r--r-- | build/ymake.core.conf | 2 | ||||
| -rw-r--r-- | library/python/pytest/plugins/ya.py | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/build/ymake.core.conf b/build/ymake.core.conf index f745b63fac..4fae81f89d 100644 --- a/build/ymake.core.conf +++ b/build/ymake.core.conf @@ -5806,6 +5806,7 @@ macro _SRC("xs", SRC, SRCFLAGS...) { macro _SRC("y", SRC, SRCFLAGS...) { # .CMD=${tool:"contrib/tools/byacc"} $BYACC_FLAGS ${nopath;noext;output:SRC.cpp} ${input:SRC} ${nopath;noext;hide;output;addincl:SRC.h} ${kv;hide:"p YC"} ${kv;hide:"pc light-green"} .CMD=${tool:"contrib/tools/bison/bison"} $BISON_FLAGS --m4=${tool:"contrib/tools/bison/m4"} -d -o ${nopath;noext;output;main;hide:SRC.h} ${nopath;noext;output:SRC.cpp} ${input:SRC} ${SRCFLAGS} && $YMAKE_PYTHON ${input:"build/scripts/preprocess.py"} $_ADD_HIDDEN_INPUTS($CPP_BISON_SKELS) ${nopath;noext;output;addincl:SRC.h} ${kv;hide:"p YC"} ${kv;hide:"pc light-green"} + .SEM=target_bison_parser PRIVATE ${input:SRC} ${output;nopath;noext;hide;suf=.o:SRC} ${nopath;noext;output;hide:SRC.h} ${nopath;noext;output;addincl;hide:SRC.h} && set_global_flags BISON_FLAGS $BISON_FLAGS && conan_require bison/3.5.3 && conan_import '"bin, bison* -> ./bin"' } # tag:src-processing @@ -5843,6 +5844,7 @@ macro _SRC("rl6", SRC, SRCFLAGS...) { macro _SRC("l", SRC, SRCFLAGS...) { .CMD=${tool:"contrib/tools/flex-old"} $LEX_FLAGS ${SRCFLAGS} -o${output:SRC.cpp} ${output_include;hide:"util/system/compiler.h"} ${input:SRC} ${kv;hide:"p LX"} ${kv;hide:"pc yellow"} .ADDINCL=contrib/tools/flex-old + .SEM=target_flex_lexers ${tool;hide:"contrib/tools/flex-old"} ${output;hide;suf=.o:SRC} ${input:SRC} && set_global_flags LEX_FLAGS $LEX_FLAGS } # tag:src-processing diff --git a/library/python/pytest/plugins/ya.py b/library/python/pytest/plugins/ya.py index 1bde03042d..1f1bf4cb59 100644 --- a/library/python/pytest/plugins/ya.py +++ b/library/python/pytest/plugins/ya.py @@ -247,10 +247,6 @@ def pytest_configure(config): if envvar + '_ORIGINAL' in os.environ: os.environ[envvar] = os.environ[envvar + '_ORIGINAL'] - if config.option.root_dir: - config.rootdir = py.path.local(config.option.root_dir) - config.invocation_params = attr.evolve(config.invocation_params, dir=config.rootdir) - extra_sys_path = [] # Arcadia paths from the test DEPENDS section of ya.make extra_sys_path.append(os.path.join(config.option.source_root, config.option.project_path)) |