Skip to content

Commit 824bcef

Browse files
authored
AliECS dump: support development setups (#7666)
1 parent 9e5b371 commit 824bcef

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

Framework/Core/src/O2ControlHelpers.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ void dumpTask(std::ostream& dumpOut, const DeviceSpec& spec, const DeviceExecuti
323323
dumpOut << indLevel << indScheme << "_module_cmdline: >-\n";
324324
dumpOut << indLevel << indScheme << indScheme << "source /etc/profile.d/modules.sh && MODULEPATH={{ modulepath }} module load O2 QualityControl Control-OCCPlugin &&\n";
325325
dumpOut << indLevel << indScheme << indScheme << "{{ dpl_command }} | " << execution.args[0] << "\n";
326-
dumpOut << indLevel << indScheme << "_plain_cmdline: \"source /etc/profile.d/o2.sh && {{ dpl_command }} | " << execution.args[0] << "\"\n";
326+
dumpOut << indLevel << indScheme << "_plain_cmdline: \"source /etc/profile.d/o2.sh && {{ len(extra_env_vars)>0 ? 'export ' + extra_env_vars + ' &&' : '' }} {{ dpl_command }} | " << execution.args[0] << "\"\n";
327327

328328
dumpOut << indLevel << "control:\n";
329329
dumpOut << indLevel << indScheme << "mode: \"fairmq\"\n";

Framework/Core/test/test_FrameworkDataFlowToO2Control.cxx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ const std::vector expectedTasks{
130130
_module_cmdline: >-
131131
source /etc/profile.d/modules.sh && MODULEPATH={{ modulepath }} module load O2 QualityControl Control-OCCPlugin &&
132132
{{ dpl_command }} | bcsadc/foo
133-
_plain_cmdline: "source /etc/profile.d/o2.sh && {{ dpl_command }} | bcsadc/foo"
133+
_plain_cmdline: "source /etc/profile.d/o2.sh && {{ len(extra_env_vars)>0 ? 'export ' + extra_env_vars + ' &&' : '' }} {{ dpl_command }} | bcsadc/foo"
134134
control:
135135
mode: "fairmq"
136136
wants:
@@ -201,7 +201,7 @@ const std::vector expectedTasks{
201201
_module_cmdline: >-
202202
source /etc/profile.d/modules.sh && MODULEPATH={{ modulepath }} module load O2 QualityControl Control-OCCPlugin &&
203203
{{ dpl_command }} | foo
204-
_plain_cmdline: "source /etc/profile.d/o2.sh && {{ dpl_command }} | foo"
204+
_plain_cmdline: "source /etc/profile.d/o2.sh && {{ len(extra_env_vars)>0 ? 'export ' + extra_env_vars + ' &&' : '' }} {{ dpl_command }} | foo"
205205
control:
206206
mode: "fairmq"
207207
wants:
@@ -272,7 +272,7 @@ const std::vector expectedTasks{
272272
_module_cmdline: >-
273273
source /etc/profile.d/modules.sh && MODULEPATH={{ modulepath }} module load O2 QualityControl Control-OCCPlugin &&
274274
{{ dpl_command }} | foo
275-
_plain_cmdline: "source /etc/profile.d/o2.sh && {{ dpl_command }} | foo"
275+
_plain_cmdline: "source /etc/profile.d/o2.sh && {{ len(extra_env_vars)>0 ? 'export ' + extra_env_vars + ' &&' : '' }} {{ dpl_command }} | foo"
276276
control:
277277
mode: "fairmq"
278278
wants:
@@ -343,7 +343,7 @@ const std::vector expectedTasks{
343343
_module_cmdline: >-
344344
source /etc/profile.d/modules.sh && MODULEPATH={{ modulepath }} module load O2 QualityControl Control-OCCPlugin &&
345345
{{ dpl_command }} | foo
346-
_plain_cmdline: "source /etc/profile.d/o2.sh && {{ dpl_command }} | foo"
346+
_plain_cmdline: "source /etc/profile.d/o2.sh && {{ len(extra_env_vars)>0 ? 'export ' + extra_env_vars + ' &&' : '' }} {{ dpl_command }} | foo"
347347
control:
348348
mode: "fairmq"
349349
wants:

0 commit comments

Comments
 (0)