Commit d1f60ac1 authored by Aurel's avatar Aurel

try to defined env elsewhere

parent d56cf7e6
...@@ -55,6 +55,7 @@ environment += ...@@ -55,6 +55,7 @@ environment +=
HOME=${buildout:directory} HOME=${buildout:directory}
PATH=${binary-link:target-directory}:{{ parameter_dict['coreutils'] }}/bin:{{ parameter_dict['perl_dbd_mariadb_path'] }} PATH=${binary-link:target-directory}:{{ parameter_dict['coreutils'] }}/bin:{{ parameter_dict['perl_dbd_mariadb_path'] }}
TZ={{ slapparameter_dict['timezone'] }} TZ={{ slapparameter_dict['timezone'] }}
RUN_UNIT_TEST=${directory:bin}/runUnitTest
MATPLOTLIBRC={{ parameter_dict['matplotlibrc'] }} MATPLOTLIBRC={{ parameter_dict['matplotlibrc'] }}
INSTANCE_HOME=${:instance-home} INSTANCE_HOME=${:instance-home}
CAUCASE={{ slapparameter_dict['caucase-url'] }} CAUCASE={{ slapparameter_dict['caucase-url'] }}
...@@ -477,6 +478,7 @@ wrapper-path = ${buildout:bin-directory}/runTestSuite ...@@ -477,6 +478,7 @@ wrapper-path = ${buildout:bin-directory}/runTestSuite
< = run-common < = run-common
environment-extra = environment-extra =
REAL_INSTANCE_HOME=${:instance-home} REAL_INSTANCE_HOME=${:instance-home}
RUN_UNIT_TEST=${directory:bin}/runUnitTest
SQLBENCH_PATH={{ parameter_dict['sqlbench_path'] }} SQLBENCH_PATH={{ parameter_dict['sqlbench_path'] }}
TEST_CA_PATH=${directory:ca-dir} TEST_CA_PATH=${directory:ca-dir}
{%- if wsgi %} {%- if wsgi %}
...@@ -512,7 +514,6 @@ command-name = runTestSuite ...@@ -512,7 +514,6 @@ command-name = runTestSuite
command-line-extra = command-line-extra =
--db_list '{{ ','.join(connection_string_list) }}' --db_list '{{ ','.join(connection_string_list) }}'
environment-extra += environment-extra +=
RUN_UNIT_TEST=${directory:bin}/runUnitTest
{#- turn a list of (ip, port) in a list of 'ip:port' #} {#- turn a list of (ip, port) in a list of 'ip:port' #}
{% set zserver_address_list = [] -%} {% set zserver_address_list = [] -%}
{% for ip, port in test_runner_address_list %} {% for ip, port in test_runner_address_list %}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment